Commit 1bb271db authored May 20, 2008 by Jeremy Fitzhardinge Committed by Linus Torvalds May 20, 2008

x86: fix warning on 32-bit non-PAE



Fix the warning:

include2/asm/pgtable.h: In function `pte_modify':
include2/asm/pgtable.h:290: warning: left shift count >= width of type

On 32-bit PAE the virtual and physical addresses are both 32-bits,
so it ends up evaluating 1<<32.  Do the shift as a 64-bit shift then
cast to the appropriate size.  This should all be done at compile time,
and so have no effect on generated code.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tested-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2bd3a99c

include/asm-x86/page.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		/* to align the pointer to the (next) page boundary */
		#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)

		#define __PHYSICAL_MASK ((((phys_addr_t)1) << __PHYSICAL_MASK_SHIFT) - 1)
		#define __PHYSICAL_MASK ((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)
		#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1)

		#ifndef __ASSEMBLY__

Admin message