summaryrefslogtreecommitdiff
path: root/arch/microblaze/kernel/cpu/pvr.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-14 10:04:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-14 10:04:04 -0800
commit464480f72e496067573e4f71bfbe3f5073d6fe33 (patch)
treedd6762ead03ae21420fdfc0133725ea71f79b5d8 /arch/microblaze/kernel/cpu/pvr.c
parent37222e1c9ee3ce587f5b41fed868bd8a592a992f (diff)
parent571202f50fad0aeb36661c79de9beed052347df8 (diff)
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (46 commits) microblaze: Remove rt_sigsuspend wrapper microblaze: nommu: Don't clobber R11 on syscalls microblaze: Remove show_tmem function microblaze: Support for WB cache microblaze: Add PVR for Microblaze v7.30.a microblaze: Remove ancient and fake microblaze version from cpu_ver table microblaze: Remove panic_timeout init value microblaze: Do not count system calls in default microblaze: Enable DTC compilation microblaze: Core oprofile configs and hooks microblaze: Fix level interrupt ACKing microblaze: Enable futimesat syscall microblaze: Checking DTS against PVR for write-back cache microblaze: Remove duplicity from pgalloc.h microblaze: Futex support microblaze: Adding dev_arch_data functions microblaze: Fix the heartbeat gpio to be more robust microblaze: Simple __copy_tofrom_user for noMMU microblaze: Export memory_start for modules microblaze: Use lowest-common-denominator default CPU settings ...
Diffstat (limited to 'arch/microblaze/kernel/cpu/pvr.c')
-rw-r--r--arch/microblaze/kernel/cpu/pvr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/cpu/pvr.c b/arch/microblaze/kernel/cpu/pvr.c
index c9a4340ddd5..9bee9382bf7 100644
--- a/arch/microblaze/kernel/cpu/pvr.c
+++ b/arch/microblaze/kernel/cpu/pvr.c
@@ -45,7 +45,7 @@
int cpu_has_pvr(void)
{
- unsigned flags;
+ unsigned long flags;
unsigned pvr0;
local_save_flags(flags);