Re: [PATCH] Fix i486 suspend to disk CR4 oops

[Dave Jones]

On Mon, Aug 18, 2008 at 08:41:20AM +0200, Ingo Molnar wrote:

 > diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
 > index 4b63c8e..5cab48e 100644
 > --- a/arch/x86/kernel/efi_32.c
 > +++ b/arch/x86/kernel/efi_32.c
 > @@ -53,7 +53,7 @@ void efi_call_phys_prelog(void)
 >  	 * directory. If I have PAE, I just need to duplicate one entry in
 >  	 * page directory.
 >  	 */
 > -	cr4 = read_cr4();
 > +	cr4 = read_cr4_safe();
 >  
 >  	if (cr4 & X86_CR4_PAE) {
 >  		efi_bak_pg_dir_pointer[0].pgd =
 > @@ -91,7 +91,7 @@ void efi_call_phys_epilog(void)
 >  	gdt_descr.size = GDT_SIZE - 1;
 >  	load_gdt(&gdt_descr);
 >  
 > -	cr4 = read_cr4();
 > +	cr4 = read_cr4_safe();
 >  
 >  	if (cr4 & X86_CR4_PAE) {
 >  		swapper_pg_dir[pgd_index(0)].pgd =

Is this part really necessary ?

Why would a 486 be in EFI code?

	Dave

-- 
http://www.codemonkey.org.uk
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/