diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:15 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:15 +1100 |
| commit | efdad722ef4d69eaaa8335deab0b6f55f52d7e57 (patch) | |
| tree | b50381ee7ec4c3616520124101db4a4b6bae669c /arch/powerpc/kernel | |
| parent | e6f08d37e6641b38b2da4ad40d6ca2cfb616a1dc (diff) | |
| parent | 987706acf8e3a6e50445c5712e994b937cbdd83c (diff) | |
| download | linux-stable-efdad722ef4d69eaaa8335deab0b6f55f52d7e57.tar.gz linux-stable-efdad722ef4d69eaaa8335deab0b6f55f52d7e57.tar.bz2 linux-stable-efdad722ef4d69eaaa8335deab0b6f55f52d7e57.zip | |
Merge branch 'ps3' into next
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2ff4f5e59620..701d4aceb4f4 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -186,8 +186,8 @@ notrace void arch_local_irq_restore(unsigned long en) * Any HV call will have this side effect. */ if (firmware_has_feature(FW_FEATURE_PS3_LV1)) { - u64 tmp; - lv1_get_version_info(&tmp); + u64 tmp, tmp2; + lv1_get_version_info(&tmp, &tmp2); } __hard_irq_enable(); |