summaryrefslogtreecommitdiff
path: root/drivers/macintosh/via-pmu.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-11-07 16:41:59 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-08 11:19:36 +1100
commit21fe3301f11a93c4f18e8480ed08522559bf0a50 (patch)
tree76076ecea25a621f0cffc856025279022ee8d234 /drivers/macintosh/via-pmu.c
parent75722d3992f57375c0cc029dcceb2334a45ceff1 (diff)
downloadlinux-3.10-21fe3301f11a93c4f18e8480ed08522559bf0a50.tar.gz
linux-3.10-21fe3301f11a93c4f18e8480ed08522559bf0a50.tar.bz2
linux-3.10-21fe3301f11a93c4f18e8480ed08522559bf0a50.zip
[PATCH] ppc: fix a bunch of warnings
Building a PowerMac kernel with ARCH=powerpc causes a bunch of warnings, this fixes some of them Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
-rw-r--r--drivers/macintosh/via-pmu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 9bc6cc6e384..7ebbc0f5342 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2667,10 +2667,10 @@ powerbook_sleep_3400(void)
asleep = 1;
/* Put the CPU into sleep mode */
- asm volatile("mfspr %0,1008" : "=r" (hid0) :);
+ hid0 = mfspr(SPRN_HID0);
hid0 = (hid0 & ~(HID0_NAP | HID0_DOZE)) | HID0_SLEEP;
- asm volatile("mtspr 1008,%0" : : "r" (hid0));
- _nmask_and_or_msr(0, MSR_POW | MSR_EE);
+ mtspr(SPRN_HID0, hid0);
+ mtmsr(mfmsr() | MSR_POW | MSR_EE);
udelay(10);
/* OK, we're awake again, start restoring things */