diff --git a/[refs] b/[refs] index 38ee5eaadc6b..e9860b727873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b2a0a6c4866cac146dcb0433e6984eb19a81335 +refs/heads/master: bd70e522afce2f7837d081dc52f261ecf9d4d2d5 diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index c140f731743b..5d33b9c08d1b 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/arch/x86/kernel/e820.c @@ -771,7 +771,7 @@ u64 __init early_reserve_e820(u64 startt, u64 sizet, u64 align) # define MAX_ARCH_PFN (1ULL<<(32-PAGE_SHIFT)) # endif #else /* CONFIG_X86_32 */ -# define MAX_ARCH_PFN MAXMEM<>PAGE_SHIFT #endif /*