diff options
author | Daniel Kiper <dkiper@net-space.pl> | 2011-05-24 20:12:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:39:29 -0400 |
commit | e3c40f379a144f35e53864a2cd970e238071afd7 (patch) | |
tree | 6636214fe729d2ee08780a44ab92bed66c0074db /include | |
parent | bf4e8902ee5080f5d2c810b639e7e778c8082b52 (diff) |
mm: pfn_to_section_nr()/section_nr_to_pfn() is valid only in CONFIG_SPARSEMEM context
pfn_to_section_nr()/section_nr_to_pfn() is valid only in CONFIG_SPARSEMEM
context. Move it to proper place.
Signed-off-by: Daniel Kiper <dkiper@net-space.pl>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mmzone.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index e56f835274c9..d7152002e18d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -928,9 +928,6 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn) | |||
928 | #define pfn_to_nid(pfn) (0) | 928 | #define pfn_to_nid(pfn) (0) |
929 | #endif | 929 | #endif |
930 | 930 | ||
931 | #define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT) | ||
932 | #define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT) | ||
933 | |||
934 | #ifdef CONFIG_SPARSEMEM | 931 | #ifdef CONFIG_SPARSEMEM |
935 | 932 | ||
936 | /* | 933 | /* |
@@ -956,6 +953,9 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn) | |||
956 | #error Allocator MAX_ORDER exceeds SECTION_SIZE | 953 | #error Allocator MAX_ORDER exceeds SECTION_SIZE |
957 | #endif | 954 | #endif |
958 | 955 | ||
956 | #define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT) | ||
957 | #define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT) | ||
958 | |||
959 | struct page; | 959 | struct page; |
960 | struct page_cgroup; | 960 | struct page_cgroup; |
961 | struct mem_section { | 961 | struct mem_section { |