diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 10:04:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 10:04:04 -0800 |
| commit | 464480f72e496067573e4f71bfbe3f5073d6fe33 (patch) | |
| tree | dd6762ead03ae21420fdfc0133725ea71f79b5d8 /arch/microblaze/include/asm/page.h | |
| parent | 37222e1c9ee3ce587f5b41fed868bd8a592a992f (diff) | |
| parent | 571202f50fad0aeb36661c79de9beed052347df8 (diff) | |
| download | op-kernel-dev-464480f72e496067573e4f71bfbe3f5073d6fe33.zip op-kernel-dev-464480f72e496067573e4f71bfbe3f5073d6fe33.tar.gz | |
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/include/asm/page.h')
| -rw-r--r-- | arch/microblaze/include/asm/page.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index 880c988..9b66c0f 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h @@ -164,7 +164,8 @@ extern int page_is_ram(unsigned long pfn); # endif /* CONFIG_MMU */ # ifndef CONFIG_MMU -# define pfn_valid(pfn) ((pfn) >= min_low_pfn && (pfn) <= max_mapnr) +# define pfn_valid(pfn) (((pfn) >= min_low_pfn) && \ + ((pfn) <= (min_low_pfn + max_mapnr))) # define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT) # else /* CONFIG_MMU */ # define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT) |
