diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 16:14:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 16:14:02 -0400 |
| commit | 3d071cd313643cf82b1ce1ce4fdf08d63ad53964 (patch) | |
| tree | 874c1683f32f07614aa123f6ca5cf6c2bd443704 /arch/tile | |
| parent | cf8e98d15361f8c594da00a3f7a500787fc1a426 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/include/asm/mmzone.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/tile/include/asm/mmzone.h b/arch/tile/include/asm/mmzone.h index c6344c4f32ac..9d3dbce8f953 100644 --- a/arch/tile/include/asm/mmzone.h +++ b/arch/tile/include/asm/mmzone.h | |||
| @@ -40,17 +40,6 @@ static inline int pfn_to_nid(unsigned long pfn) | |||
| 40 | return highbits_to_node[__pfn_to_highbits(pfn)]; | 40 | return highbits_to_node[__pfn_to_highbits(pfn)]; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | /* | ||
| 44 | * Following are macros that each numa implmentation must define. | ||
| 45 | */ | ||
| 46 | |||
| 47 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) | ||
| 48 | #define node_end_pfn(nid) \ | ||
| 49 | ({ \ | ||
| 50 | pg_data_t *__pgdat = NODE_DATA(nid); \ | ||
| 51 | __pgdat->node_start_pfn + __pgdat->node_spanned_pages; \ | ||
| 52 | }) | ||
| 53 | |||
| 54 | #define kern_addr_valid(kaddr) virt_addr_valid((void *)kaddr) | 43 | #define kern_addr_valid(kaddr) virt_addr_valid((void *)kaddr) |
| 55 | 44 | ||
| 56 | static inline int pfn_valid(int pfn) | 45 | static inline int pfn_valid(int pfn) |