Commit 4b529401 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Linus Torvalds

mm: make totalhigh_pages unsigned long

Makes it consistent with the extern declaration, used when CONFIG_HIGHMEM
is set Removes redundant casts in printout messages
Signed-off-by: default avatarAndreas Fenkart <andreas.fenkart@streamunlimited.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 50f411e3
...@@ -616,7 +616,7 @@ void __init mem_init(void) ...@@ -616,7 +616,7 @@ void __init mem_init(void)
"%dK data, %dK init, %luK highmem)\n", "%dK data, %dK init, %luK highmem)\n",
nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10, nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
datasize >> 10, initsize >> 10, datasize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); totalhigh_pages << (PAGE_SHIFT-10));
if (PAGE_SIZE >= 16384 && num_physpages <= 128) { if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
extern int sysctl_overcommit_memory; extern int sysctl_overcommit_memory;
......
...@@ -424,7 +424,7 @@ void __init mem_init(void) ...@@ -424,7 +424,7 @@ void __init mem_init(void)
reservedpages << (PAGE_SHIFT-10), reservedpages << (PAGE_SHIFT-10),
datasize >> 10, datasize >> 10,
initsize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); totalhigh_pages << (PAGE_SHIFT-10));
} }
#endif /* !CONFIG_NEED_MULTIPLE_NODES */ #endif /* !CONFIG_NEED_MULTIPLE_NODES */
......
...@@ -505,5 +505,5 @@ void __init mem_init(void) ...@@ -505,5 +505,5 @@ void __init mem_init(void)
(num_physpages - tmp) << (PAGE_SHIFT-10), (num_physpages - tmp) << (PAGE_SHIFT-10),
datasize >> 10, datasize >> 10,
initsize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); totalhigh_pages << (PAGE_SHIFT-10));
} }
...@@ -118,8 +118,7 @@ void __init mem_init(void) ...@@ -118,8 +118,7 @@ void __init mem_init(void)
reservedpages << (PAGE_SHIFT - 10), reservedpages << (PAGE_SHIFT - 10),
datasize >> 10, datasize >> 10,
initsize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT - 10)) totalhigh_pages << (PAGE_SHIFT - 10));
);
} }
/* /*
......
...@@ -106,7 +106,7 @@ void __init mem_init(void) ...@@ -106,7 +106,7 @@ void __init mem_init(void)
ram << (PAGE_SHIFT-10), codesize >> 10, ram << (PAGE_SHIFT-10), codesize >> 10,
reservedpages << (PAGE_SHIFT-10), datasize >> 10, reservedpages << (PAGE_SHIFT-10), datasize >> 10,
initsize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); totalhigh_pages << (PAGE_SHIFT-10));
} }
#endif /* !CONFIG_NEED_MULTIPLE_NODES */ #endif /* !CONFIG_NEED_MULTIPLE_NODES */
......
...@@ -892,8 +892,7 @@ void __init mem_init(void) ...@@ -892,8 +892,7 @@ void __init mem_init(void)
reservedpages << (PAGE_SHIFT-10), reservedpages << (PAGE_SHIFT-10),
datasize >> 10, datasize >> 10,
initsize >> 10, initsize >> 10,
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) totalhigh_pages << (PAGE_SHIFT-10));
);
printk(KERN_INFO "virtual kernel memory layout:\n" printk(KERN_INFO "virtual kernel memory layout:\n"
" fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
......
...@@ -46,7 +46,7 @@ void kmap_flush_unused(void); ...@@ -46,7 +46,7 @@ void kmap_flush_unused(void);
static inline unsigned int nr_free_highpages(void) { return 0; } static inline unsigned int nr_free_highpages(void) { return 0; }
#define totalhigh_pages 0 #define totalhigh_pages 0UL
#ifndef ARCH_HAS_KMAP #ifndef ARCH_HAS_KMAP
static inline void *kmap(struct page *page) static inline void *kmap(struct page *page)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment