Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ void __init mem_init(void) 
		"%dK data, %dK init, %luK highmem)\n",

		nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,

		datasize >> 10, initsize >> 10,

		(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

		totalhigh_pages << (PAGE_SHIFT-10));



	if (PAGE_SIZE >= 16384 && num_physpages <= 128) {

		extern int sysctl_overcommit_memory;

arch/mips/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ void __init mem_init(void) 
	       reservedpages << (PAGE_SHIFT-10),

	       datasize >> 10,

	       initsize >> 10,

	       (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

	       totalhigh_pages << (PAGE_SHIFT-10));

}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */

arch/mips/sgi-ip27/ip27-memory.c

+1 −1
Original line number Diff line number Diff line
@@ -505,5 +505,5 @@ void __init mem_init(void) 
	       (num_physpages - tmp) << (PAGE_SHIFT-10),

	       datasize >> 10,

	       initsize >> 10,

	       (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

	       totalhigh_pages << (PAGE_SHIFT-10));

}

arch/mn10300/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ void __init mem_init(void) 
	       reservedpages << (PAGE_SHIFT - 10),

	       datasize >> 10,

	       initsize >> 10,

	       (unsigned long) (totalhigh_pages << (PAGE_SHIFT - 10))

	       );

	       totalhigh_pages << (PAGE_SHIFT - 10));

}



/*

arch/score/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void __init mem_init(void) 
			ram << (PAGE_SHIFT-10), codesize >> 10,

			reservedpages << (PAGE_SHIFT-10), datasize >> 10,

			initsize >> 10,

			(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));

			totalhigh_pages << (PAGE_SHIFT-10));

}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */