diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /arch/tile | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
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) |