From: Andrew Morton <akpm@linux-foundation.org>

Cc: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/i386/kernel/setup.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff -puN arch/i386/kernel/setup.c~use-extended-crashkernel-command-line-on-i386-fix-config_nohighmem-for-extended-crashkernel-command-line-fix arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~use-extended-crashkernel-command-line-on-i386-fix-config_nohighmem-for-extended-crashkernel-command-line-fix
+++ a/arch/i386/kernel/setup.c
@@ -381,20 +381,19 @@ extern unsigned long __init setup_memory
 extern void zone_sizes_init(void);
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
-
 #ifdef CONFIG_HIGHMEM
 static inline unsigned long long get_total_mem(void)
 {
-	return (max_low_pfn + highend_pfn - highstart_pfn) << PAGE_SHIFT;
+	return (unsigned long long)
+		(max_low_pfn + highend_pfn - highstart_pfn) << PAGE_SHIFT;
 }
 #else
 static inline unsigned long long get_total_mem(void)
 {
-	return max_low_pfn << PAGE_SHIFT;
+	return (unsigned long long)max_low_pfn << PAGE_SHIFT;
 }
 #endif
 
-
 #ifdef CONFIG_KEXEC
 static void __init reserve_crashkernel(void)
 {
_