diff options
Diffstat (limited to 'arch/parisc/include/asm/mmzone.h')
| -rw-r--r-- | arch/parisc/include/asm/mmzone.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h index 0e625ab9aaec..cc50d33b7b88 100644 --- a/arch/parisc/include/asm/mmzone.h +++ b/arch/parisc/include/asm/mmzone.h | |||
| @@ -39,17 +39,14 @@ extern unsigned char pfnnid_map[PFNNID_MAP_MAX]; | |||
| 39 | static inline int pfn_to_nid(unsigned long pfn) | 39 | static inline int pfn_to_nid(unsigned long pfn) |
| 40 | { | 40 | { |
| 41 | unsigned int i; | 41 | unsigned int i; |
| 42 | unsigned char r; | ||
| 43 | 42 | ||
| 44 | if (unlikely(pfn_is_io(pfn))) | 43 | if (unlikely(pfn_is_io(pfn))) |
| 45 | return 0; | 44 | return 0; |
| 46 | 45 | ||
| 47 | i = pfn >> PFNNID_SHIFT; | 46 | i = pfn >> PFNNID_SHIFT; |
| 48 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); | 47 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); |
| 49 | r = pfnnid_map[i]; | ||
| 50 | BUG_ON(r == 0xff); | ||
| 51 | 48 | ||
| 52 | return (int)r; | 49 | return (int)pfnnid_map[i]; |
| 53 | } | 50 | } |
| 54 | 51 | ||
| 55 | static inline int pfn_valid(int pfn) | 52 | static inline int pfn_valid(int pfn) |
