Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
Acked-by: Russell 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Andreas Fenkart and committed by
Linus Torvalds
4b529401 50f411e3

+7 -9
+1 -1
arch/arm/mm/init.c
··· 616 616 "%dK data, %dK init, %luK highmem)\n", 617 617 nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10, 618 618 datasize >> 10, initsize >> 10, 619 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); 619 + totalhigh_pages << (PAGE_SHIFT-10)); 620 620 621 621 if (PAGE_SIZE >= 16384 && num_physpages <= 128) { 622 622 extern int sysctl_overcommit_memory;
+1 -1
arch/mips/mm/init.c
··· 424 424 reservedpages << (PAGE_SHIFT-10), 425 425 datasize >> 10, 426 426 initsize >> 10, 427 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); 427 + totalhigh_pages << (PAGE_SHIFT-10)); 428 428 } 429 429 #endif /* !CONFIG_NEED_MULTIPLE_NODES */ 430 430
+1 -1
arch/mips/sgi-ip27/ip27-memory.c
··· 505 505 (num_physpages - tmp) << (PAGE_SHIFT-10), 506 506 datasize >> 10, 507 507 initsize >> 10, 508 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); 508 + totalhigh_pages << (PAGE_SHIFT-10)); 509 509 }
+1 -2
arch/mn10300/mm/init.c
··· 118 118 reservedpages << (PAGE_SHIFT - 10), 119 119 datasize >> 10, 120 120 initsize >> 10, 121 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT - 10)) 122 - ); 121 + totalhigh_pages << (PAGE_SHIFT - 10)); 123 122 } 124 123 125 124 /*
+1 -1
arch/score/mm/init.c
··· 106 106 ram << (PAGE_SHIFT-10), codesize >> 10, 107 107 reservedpages << (PAGE_SHIFT-10), datasize >> 10, 108 108 initsize >> 10, 109 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))); 109 + totalhigh_pages << (PAGE_SHIFT-10)); 110 110 } 111 111 #endif /* !CONFIG_NEED_MULTIPLE_NODES */ 112 112
+1 -2
arch/x86/mm/init_32.c
··· 892 892 reservedpages << (PAGE_SHIFT-10), 893 893 datasize >> 10, 894 894 initsize >> 10, 895 - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) 896 - ); 895 + totalhigh_pages << (PAGE_SHIFT-10)); 897 896 898 897 printk(KERN_INFO "virtual kernel memory layout:\n" 899 898 " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
+1 -1
include/linux/highmem.h
··· 46 46 47 47 static inline unsigned int nr_free_highpages(void) { return 0; } 48 48 49 - #define totalhigh_pages 0 49 + #define totalhigh_pages 0UL 50 50 51 51 #ifndef ARCH_HAS_KMAP 52 52 static inline void *kmap(struct page *page)