aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-03-15 17:52:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-15 19:55:16 -0400
commit3701dc815117e0317f6fcf062ff8a28cd171ce44 (patch)
tree21683f1b81d4ccc412c56df0cf2c98cc6573bb64
parent25528213fe9f75f4e286f08d35a73ca2bb634a50 (diff)
m32r: mm: fix build warning
While building we are getting warnings: arch/m32r/mm/init.c:63:17: warning: unused variable 'low' arch/m32r/mm/init.c:62:17: warning: unused variable 'max_dma' max_dma and low are only used if CONFIG_MMU is defined. Lets declare the variables inside the #ifdef. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m32r/mm/init.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index 0d4146f644dc..11fa717d93b1 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -59,21 +59,24 @@ void free_initrd_mem(unsigned long, unsigned long);
59void __init zone_sizes_init(void) 59void __init zone_sizes_init(void)
60{ 60{
61 unsigned long zones_size[MAX_NR_ZONES] = {0, }; 61 unsigned long zones_size[MAX_NR_ZONES] = {0, };
62 unsigned long max_dma;
63 unsigned long low;
64 unsigned long start_pfn; 62 unsigned long start_pfn;
65 63
66#ifdef CONFIG_MMU 64#ifdef CONFIG_MMU
67 start_pfn = START_PFN(0); 65 {
68 max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; 66 unsigned long low;
69 low = MAX_LOW_PFN(0); 67 unsigned long max_dma;
70 68
71 if (low < max_dma){ 69 start_pfn = START_PFN(0);
72 zones_size[ZONE_DMA] = low - start_pfn; 70 max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
73 zones_size[ZONE_NORMAL] = 0; 71 low = MAX_LOW_PFN(0);
74 } else { 72
75 zones_size[ZONE_DMA] = low - start_pfn; 73 if (low < max_dma) {
76 zones_size[ZONE_NORMAL] = low - max_dma; 74 zones_size[ZONE_DMA] = low - start_pfn;
75 zones_size[ZONE_NORMAL] = 0;
76 } else {
77 zones_size[ZONE_DMA] = low - start_pfn;
78 zones_size[ZONE_NORMAL] = low - max_dma;
79 }
77 } 80 }
78#else 81#else
79 zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; 82 zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;