diff --git a/[refs] b/[refs] index 285d10e7bd15..fa77cb5615ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a79cf9c1aa671325fa5ba37576c2cee23823d04 +refs/heads/master: 537d916066f66de18dbca79adf82933cd12d2a36 diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c index fd639d9f79b6..d4ad6e8ae886 100644 --- a/trunk/arch/x86/kernel/setup_32.c +++ b/trunk/arch/x86/kernel/setup_32.c @@ -228,7 +228,7 @@ static inline void copy_edd(void) } #endif -int __initdata user_defined_memmap = 0; +int __initdata user_defined_memmap; /* * "mem=nopentium" disables the 4MB page tables.