diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:13:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:13:53 -0800 |
| commit | a288465fa86731108c0ee590da505abe65480473 (patch) | |
| tree | fb3ea0025fa4084dc7a5762a783f635affe39d5e /arch/microblaze/kernel/cpu/pvr.c | |
| parent | 80d02d273641d515269c016d9e8da5882e4432e4 (diff) | |
| parent | 0eb6aaf52965c14ba3ea245448c4806cfcd1d18c (diff) | |
| download | linux-a288465fa86731108c0ee590da505abe65480473.tar.bz2 | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix msr instruction detection
microblaze: Fix pte_update function
microblaze: Fix asm compilation warning
microblaze: Fix IRQ flag handling for MSR=0
Diffstat (limited to 'arch/microblaze/kernel/cpu/pvr.c')
| -rw-r--r-- | arch/microblaze/kernel/cpu/pvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/cpu/pvr.c b/arch/microblaze/kernel/cpu/pvr.c index e01afa68273e..488c1ed24e38 100644 --- a/arch/microblaze/kernel/cpu/pvr.c +++ b/arch/microblaze/kernel/cpu/pvr.c @@ -27,7 +27,7 @@ register unsigned tmp __asm__("r3"); \ tmp = 0x0; /* Prevent warning about unused */ \ __asm__ __volatile__ ( \ - "mfs %0, rpvr" #pvrid ";" \ + "mfs %0, rpvr" #pvrid ";" \ : "=r" (tmp) : : "memory"); \ val = tmp; \ } @@ -54,7 +54,7 @@ int cpu_has_pvr(void) if (!(flags & PVR_MSR_BIT)) return 0; - get_single_pvr(0x00, pvr0); + get_single_pvr(0, pvr0); pr_debug("%s: pvr0 is 0x%08x\n", __func__, pvr0); if (pvr0 & PVR0_PVR_FULL_MASK) |