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

Commit 650ec5a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 35ffccdb 04c17341

arch/x86/kernel/head_32.S

+10 −3
Original line number Diff line number Diff line
@@ -62,8 +62,15 @@ 
#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