summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 17:51:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 17:51:59 -0700
commit650ec5a6bd5df4ab0c9ef38d05b94cd82fb99ad8 (patch)
tree90a6a6dec4f2383373600c55b04a01b05fe75c2a
parent35ffccdb7e014a88c58e3161b36fe8890f5bab7b (diff)
parent04c17341b42699a5859a8afa05e64ba08a4e5235 (diff)
downloadblackbird-op-linux-650ec5a6bd5df4ab0c9ef38d05b94cd82fb99ad8.tar.gz
blackbird-op-linux-650ec5a6bd5df4ab0c9ef38d05b94cd82fb99ad8.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 warning fixlet from Ingo Molnar: "A build fix for certain (rare) variants of binutils that did not make it into v4.1" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Fix overflow warning with 32-bit binutils
-rw-r--r--arch/x86/kernel/head_32.S13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 53eeb226657c..7e429c99c728 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -62,9 +62,16 @@
#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
#endif
-/* Number of possible pages in the lowmem region */
-LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
-
+/*
+ * Number of possible pages in the lowmem region.
+ *
+ * We shift 2 by 31 instead of 1 by 32 to the left in order to avoid a
+ * gas warning about overflowing shift count when gas has been compiled
+ * with only a host target support using a 32-bit type for internal
+ * representation.
+ */
+LOWMEM_PAGES = (((2<<31) - __PAGE_OFFSET) >> PAGE_SHIFT)
+
/* Enough space to fit pagetables for the low memory linear map */
MAPPING_BEYOND_END = PAGE_TABLE_SIZE(LOWMEM_PAGES) << PAGE_SHIFT
OpenPOWER on IntegriCloud