Index: trunk/i386/libsaio/efi.h
===================================================================
--- trunk/i386/libsaio/efi.h	(revision 2417)
+++ trunk/i386/libsaio/efi.h	(revision 2418)
@@ -231,7 +231,7 @@
 // range requires a runtime mapping
 
 #define EFI_MEMORY_RUNTIME  0x8000000000000000ULL
-
+#define EFI_MEMORY_KERN_RESERVED (1ULL << 59)
 typedef EFI_UINT64  EFI_PHYSICAL_ADDRESS;
 typedef EFI_UINT64  EFI_VIRTUAL_ADDRESS;
 
@@ -254,7 +254,7 @@
   IN EFI_UINTN                    DescriptorSize,
   IN EFI_UINT32                   DescriptorVersion,
   IN EFI_MEMORY_DESCRIPTOR        * VirtualMap
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -262,7 +262,7 @@
 (EFIAPI *EFI_CONVERT_POINTER) (
   IN EFI_UINTN                DebugDisposition,
   IN OUT VOID                 **Address
-  ) __attribute__((regparm(0)));
+  );
 
 
 // Variable attributes
@@ -281,7 +281,7 @@
   OUT EFI_UINT32              * Attributes OPTIONAL,
   IN OUT EFI_UINTN            * DataSize,
   OUT VOID                    * Data
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -290,7 +290,7 @@
   IN OUT EFI_UINTN            * VariableNameSize,
   IN OUT EFI_CHAR16           * VariableName,
   IN OUT EFI_GUID             * VendorGuid
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -301,7 +301,7 @@
   IN EFI_UINT32               Attributes,
   IN EFI_UINTN                DataSize,
   IN VOID                     * Data
-  ) __attribute__((regparm(0)));
+  );
 
 
 // EFI Time
@@ -318,14 +318,14 @@
 (EFIAPI *EFI_GET_TIME) (
   OUT EFI_TIME                * Time,
   OUT EFI_TIME_CAPABILITIES   * Capabilities OPTIONAL
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
 EFI_STATUS
 (EFIAPI *EFI_SET_TIME) (
   IN EFI_TIME                 * Time
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -334,7 +334,7 @@
   OUT EFI_BOOLEAN             * Enabled,
   OUT EFI_BOOLEAN             * Pending,
   OUT EFI_TIME                * Time
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -342,7 +342,7 @@
 (EFIAPI *EFI_SET_WAKEUP_TIME) (
   IN EFI_BOOLEAN              Enable,
   IN EFI_TIME                 * Time OPTIONAL
-  ) __attribute((regparm(0)));
+  );
 
 typedef enum {
   EfiResetCold,
@@ -363,7 +363,7 @@
   IN EFI_STATUS                   ResetStatus,
   IN EFI_UINTN                    DataSize,
   IN EFI_CHAR16                   * ResetData OPTIONAL
-  ) __attribute__((regparm(0)));
+  );
 
 typedef
 EFI_RUNTIMESERVICE
@@ -391,7 +391,7 @@
   IN EFI_UINT32                 Instance,
   IN EFI_GUID                   * CallerId OPTIONAL,
   IN EFI_STATUS_CODE_DATA       * Data OPTIONAL
-  ) __attribute__((regparm(0)));
+  );
 
 #endif
 //
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 2417)
+++ trunk/i386/boot2/boot.h	(revision 2418)
@@ -32,7 +32,7 @@
  * Paths used by chameleon
  */
 
-//kernel cache
+// kernel cache
 #define kDefaultCachePathLeo "/System/Library/Caches/com.apple.kernelcaches/"
 #define kDefaultCachePathSnow "/System/Library/Caches/com.apple.kext.caches/Startup/"
 
@@ -72,7 +72,7 @@
 #define kDefaultKernel		"mach_kernel"
 #define kGUIKey			"GUI"
 #define kBootBannerKey		"Boot Banner"
-#define kShowInfoKey		"ShowInfo"		// gui.c
+#define kShowInfoKey		"ShowInfo"		/* gui.c */
 #define kWaitForKeypressKey	"Wait"
 
 /* AsereBLN: added these keys */
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 2417)
+++ trunk/CHANGES	(revision 2418)
@@ -1,3 +1,4 @@
+- Update efi Header
 - buffer BPS
 - devprop_generate_string optimized by cparm
 - Update CPUID and change conditional logic.