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

Commit c57c05d0 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Linus Torvalds
Browse files

x86: rearrange __(VIRTUAL|PHYSICAL)_MASK 



Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tested-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1bb271db

include/asm-x86/page.h

+3 −3
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 


#ifdef __KERNEL__



#define __PHYSICAL_MASK		((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)

#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)



/* Cast PAGE_MASK to a signed type so that it is sign-extended if

   virtual addresses are 32-bits but physical addresses are larger

   (ie, 32-bit PAE). */
@@ -29,9 +32,6 @@ 
/* 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)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)

#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)



#ifndef __ASSEMBLY__

#include <linux/types.h>

#endif