[RFC 3/7] powerpc/mm: Define TOP_ZONE as a constant
From: Anshuman Khandual <hidden>
Date: 2016-05-03 06:30:24
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
From: Oliver O'Halloran <oohall@gmail.com> The zone that contains the top of the memory will be either ZONE_NORMAL or ZONE_HIGHMEM depending on the kernel config. There are two functions in there which require this information and both of them use an #ifdef to set a local variable (top_zone). This is a little nuts, so lets just make it a constant. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/mm/mem.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index ac79dbd..bcaede4 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c@@ -61,6 +61,12 @@ #define CPU_FTR_NOEXECUTE 0 #endif +#ifdef CONFIG_HIGHMEM +#define TOP_ZONE ZONE_HIGHMEM +#else +#define TOP_ZONE ZONE_NORMAL +#endif + unsigned long long memory_limit; #ifdef CONFIG_HIGHMEM
@@ -267,14 +273,9 @@ void __init limit_zone_pfn(enum zone_type zone, unsigned long pfn_limit) */ int dma_pfn_limit_to_zone(u64 pfn_limit) { - enum zone_type top_zone = ZONE_NORMAL; int i; -#ifdef CONFIG_HIGHMEM - top_zone = ZONE_HIGHMEM; -#endif - - for (i = top_zone; i >= 0; i--) { + for (i = TOP_ZONE; i >= 0; i--) { if (max_zone_pfns[i] <= pfn_limit) return i; }
@@ -289,7 +290,6 @@ void __init paging_init(void) { unsigned long long total_ram = memblock_phys_mem_size(); phys_addr_t top_of_ram = memblock_end_of_DRAM(); - enum zone_type top_zone; #ifdef CONFIG_PPC32 unsigned long v = __fix_to_virt(__end_of_fixed_addresses - 1);
@@ -313,13 +313,9 @@ void __init paging_init(void) (long int)((top_of_ram - total_ram) >> 20)); #ifdef CONFIG_HIGHMEM - top_zone = ZONE_HIGHMEM; limit_zone_pfn(ZONE_NORMAL, lowmem_end_addr >> PAGE_SHIFT); -#else - top_zone = ZONE_NORMAL; #endif - - limit_zone_pfn(top_zone, top_of_ram >> PAGE_SHIFT); + limit_zone_pfn(TOP_ZONE, top_of_ram >> PAGE_SHIFT); zone_limits_final = true; free_area_init_nodes(max_zone_pfns);
--
1.8.3.1