On Thu, May 13, 2004 at 03:38:06PM +0200, Adrian Bunk wrote:
> On Thu, May 13, 2004 at 03:27:36AM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.6-mm1:
> >...
> > +efivars-fix.patch
> > 
> >  Fix oops with efivars enabled but not avaialble.
> 
> This patch broke EFI_VARS=m:

Duh.  i386 needs to export efi_enabled.  ia64 doesn't as it's a
#define in linux/efi.h.  Matt T, are you working on EFI for x86_64
too?  Patch below for i386.


-- 
Matt Domsch
Sr. Software Engineer, Lead Engineer
Dell Linux Solutions linux.dell.com & www.dell.com/linux
Linux on Dell mailing lists @ http://lists.us.dell.com


Export efi_enabled to modules such as efivars.  Only needed on i386 at
present, as ia64 has this as a #define in linux/efi.h, and EFI isn't
available for other arches.


===== arch/i386/kernel/setup.c 1.118 vs edited =====
--- 1.118/arch/i386/kernel/setup.c	Wed Apr 28 02:09:40 2004
+++ edited/arch/i386/kernel/setup.c	Thu May 13 09:58:01 2004
@@ -65,6 +65,7 @@
 
 #ifdef CONFIG_EFI
 int efi_enabled = 0;
+EXPORT_SYMBOL(efi_enabled);
 #endif
 
 /* cpu data as detected by the assembly code in head.S */