From: Jeremy Fitzhardinge Date: Tue, 20 May 2008 07:26:18 +0000 (+0100) Subject: x86: fix warning on 32-bit non-PAE X-Git-Tag: v2.6.26-rc4~110 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1bb271db63c356212564aad050b2cf026f800858;p=linux-2.6-omap-h63xx.git 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 Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds --- diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 76b35e636d7..223146da2fa 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h @@ -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__