Re: [Xen-ia64-devel] [PATCH]minios: remove big endian stuff

2008-11-24 Thread Isaku Yamahata
Applied, thanks.

On Tue, Nov 18, 2008 at 10:49:01AM +0100, Dietmar Hahn wrote:
 Hi,
 
 this patch removes all the useless big endian stuff from the minios.
 Thanks.
 
 Dietmar.

 # HG changeset patch
 # User [EMAIL PROTECTED]
 # Date 1227002151 -3600
 # Node ID 56ecdf7c49e7d86caf476da7119a8b19c5496910
 # Parent  cf3b9afb8568a18250faf08a0dd7c2b57bc7d3ac
 
 Remove the useless big endian stuff.
 
 Signed-off-by: Dietmar Hahn [EMAIL PROTECTED]
 
 diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/arch.mk
 --- a/extras/mini-os/arch/ia64/arch.mkMon Nov 17 09:27:02 2008 +0100
 +++ b/extras/mini-os/arch/ia64/arch.mkTue Nov 18 10:55:51 2008 +0100
 @@ -1,5 +1,3 @@
 -# Build for Big Endian?
 -BIGENDIAN ?= n
  
  ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
  ARCH_CFLAGS += -O2
 @@ -9,12 +7,3 @@ ARCH_ASFLAGS += -fno-builtin -fno-common
  
  ARCH_LDFLAGS = -warn-common
  
 -# Next lines are for big endian code !
 -ifeq ($(BIGENDIAN),y)
 -ARCH_CFLAGS += -mbig-endian -Wa,-mbe -Wa,-mlp64
 -ARCH_CFLAGS += -DBIG_ENDIAN
 -ARCH_ASFLAGS += -Wa,-mbe
 -ARCH_ASFLAGS += -DBIG_ENDIAN
 -ARCH_LDFLAGS = -EB -d
 -endif
 -
 diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/common.c
 --- a/extras/mini-os/arch/ia64/common.c   Mon Nov 17 09:27:02 2008 +0100
 +++ b/extras/mini-os/arch/ia64/common.c   Tue Nov 18 10:55:51 2008 +0100
 @@ -116,8 +116,8 @@ registerCallback(void)
  {
   struct callback_register event =
   {
 - .type = SWAP(CALLBACKTYPE_event),
 - .address = SWAP((unsigned long)hypervisor_callback),
 + .type = CALLBACKTYPE_event,
 + .address = (unsigned long)hypervisor_callback,
   };
   HYPERVISOR_callback_op(CALLBACKOP_register, event);
  }
 @@ -126,46 +126,44 @@ init_start_info(start_info_t* xen_start_
  init_start_info(start_info_t* xen_start_info)
  {
   /* Make a copy of the start_info structure */
 - start_info.nr_pages = SWAP(xen_start_info-nr_pages);
 - start_info.shared_info = SWAP(xen_start_info-shared_info);
 - start_info.flags = SWAP(xen_start_info-flags);
 - start_info.store_mfn = SWAP(xen_start_info-store_mfn);
 - start_info.store_evtchn = SWAP(xen_start_info-store_evtchn);
 - start_info.console.domU.mfn = SWAP(xen_start_info-console.domU.mfn);
 + start_info.nr_pages = xen_start_info-nr_pages;
 + start_info.shared_info = xen_start_info-shared_info;
 + start_info.flags = xen_start_info-flags;
 + start_info.store_mfn = xen_start_info-store_mfn;
 + start_info.store_evtchn = xen_start_info-store_evtchn;
 + start_info.console.domU.mfn = xen_start_info-console.domU.mfn;
   start_info.console.domU.evtchn =
 - SWAP(xen_start_info-console.domU.evtchn);
 - start_info.pt_base = SWAP(xen_start_info-pt_base);
 - start_info.nr_pt_frames = SWAP(xen_start_info-nr_pt_frames);
 - start_info.mfn_list = SWAP(xen_start_info-mfn_list);
 - start_info.mod_start = SWAP(xen_start_info-mod_start);
 - start_info.mod_len = SWAP(xen_start_info-mod_len);
 + xen_start_info-console.domU.evtchn;
 + start_info.pt_base = xen_start_info-pt_base;
 + start_info.nr_pt_frames = xen_start_info-nr_pt_frames;
 + start_info.mfn_list = xen_start_info-mfn_list;
 + start_info.mod_start = xen_start_info-mod_start;
 + start_info.mod_len = xen_start_info-mod_len;
  }
  
  static void
  init_boot_params(void)
  {
 - ia64BootParamG.command_line = SWAP(ia64_boot_paramP-command_line);
 - ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP-efi_systab);
 - ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP-efi_memmap);
 - ia64BootParamG.efi_memmap_size =
 - SWAP(ia64_boot_paramP-efi_memmap_size);
 - ia64BootParamG.efi_memdesc_size =
 - SWAP(ia64_boot_paramP-efi_memdesc_size);
 + ia64BootParamG.command_line = ia64_boot_paramP-command_line;
 + ia64BootParamG.efi_systab = ia64_boot_paramP-efi_systab;
 + ia64BootParamG.efi_memmap = ia64_boot_paramP-efi_memmap;
 + ia64BootParamG.efi_memmap_size = ia64_boot_paramP-efi_memmap_size;
 + ia64BootParamG.efi_memdesc_size = ia64_boot_paramP-efi_memdesc_size;
   ia64BootParamG.efi_memdesc_version =
 - SWAP(ia64_boot_paramP-efi_memdesc_version);
 + ia64_boot_paramP-efi_memdesc_version;
   ia64BootParamG.console_info.num_cols =
 - SWAP(ia64_boot_paramP-console_info.num_cols);
 + ia64_boot_paramP-console_info.num_cols;
   ia64BootParamG.console_info.num_rows =
 - SWAP(ia64_boot_paramP-console_info.num_rows);
 + ia64_boot_paramP-console_info.num_rows;
   ia64BootParamG.console_info.orig_x =
 - SWAP(ia64_boot_paramP-console_info.orig_x);
 +  

[Xen-ia64-devel] [PATCH]minios: remove big endian stuff

2008-11-18 Thread Dietmar Hahn
Hi,

this patch removes all the useless big endian stuff from the minios.
Thanks.

Dietmar.
# HG changeset patch
# User [EMAIL PROTECTED]
# Date 1227002151 -3600
# Node ID 56ecdf7c49e7d86caf476da7119a8b19c5496910
# Parent  cf3b9afb8568a18250faf08a0dd7c2b57bc7d3ac

Remove the useless big endian stuff.

Signed-off-by: Dietmar Hahn [EMAIL PROTECTED]

diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/arch.mk
--- a/extras/mini-os/arch/ia64/arch.mk	Mon Nov 17 09:27:02 2008 +0100
+++ b/extras/mini-os/arch/ia64/arch.mk	Tue Nov 18 10:55:51 2008 +0100
@@ -1,5 +1,3 @@
-# Build for Big Endian?
-BIGENDIAN ?= n
 
 ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
 ARCH_CFLAGS += -O2
@@ -9,12 +7,3 @@ ARCH_ASFLAGS += -fno-builtin -fno-common
 
 ARCH_LDFLAGS = -warn-common
 
-# Next lines are for big endian code !
-ifeq ($(BIGENDIAN),y)
-ARCH_CFLAGS += -mbig-endian -Wa,-mbe -Wa,-mlp64
-ARCH_CFLAGS += -DBIG_ENDIAN
-ARCH_ASFLAGS += -Wa,-mbe
-ARCH_ASFLAGS += -DBIG_ENDIAN
-ARCH_LDFLAGS = -EB -d
-endif
-
diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/common.c
--- a/extras/mini-os/arch/ia64/common.c	Mon Nov 17 09:27:02 2008 +0100
+++ b/extras/mini-os/arch/ia64/common.c	Tue Nov 18 10:55:51 2008 +0100
@@ -116,8 +116,8 @@ registerCallback(void)
 {
 	struct callback_register event =
 	{
-		.type = SWAP(CALLBACKTYPE_event),
-		.address = SWAP((unsigned long)hypervisor_callback),
+		.type = CALLBACKTYPE_event,
+		.address = (unsigned long)hypervisor_callback,
 	};
 	HYPERVISOR_callback_op(CALLBACKOP_register, event);
 }
@@ -126,46 +126,44 @@ init_start_info(start_info_t* xen_start_
 init_start_info(start_info_t* xen_start_info)
 {
 	/* Make a copy of the start_info structure */
-	start_info.nr_pages = SWAP(xen_start_info-nr_pages);
-	start_info.shared_info = SWAP(xen_start_info-shared_info);
-	start_info.flags = SWAP(xen_start_info-flags);
-	start_info.store_mfn = SWAP(xen_start_info-store_mfn);
-	start_info.store_evtchn	= SWAP(xen_start_info-store_evtchn);
-	start_info.console.domU.mfn = SWAP(xen_start_info-console.domU.mfn);
+	start_info.nr_pages = xen_start_info-nr_pages;
+	start_info.shared_info = xen_start_info-shared_info;
+	start_info.flags = xen_start_info-flags;
+	start_info.store_mfn = xen_start_info-store_mfn;
+	start_info.store_evtchn	= xen_start_info-store_evtchn;
+	start_info.console.domU.mfn = xen_start_info-console.domU.mfn;
 	start_info.console.domU.evtchn =
-SWAP(xen_start_info-console.domU.evtchn);
-	start_info.pt_base = SWAP(xen_start_info-pt_base);
-	start_info.nr_pt_frames	= SWAP(xen_start_info-nr_pt_frames);
-	start_info.mfn_list = SWAP(xen_start_info-mfn_list);
-	start_info.mod_start = SWAP(xen_start_info-mod_start);
-	start_info.mod_len = SWAP(xen_start_info-mod_len);
+xen_start_info-console.domU.evtchn;
+	start_info.pt_base = xen_start_info-pt_base;
+	start_info.nr_pt_frames	= xen_start_info-nr_pt_frames;
+	start_info.mfn_list = xen_start_info-mfn_list;
+	start_info.mod_start = xen_start_info-mod_start;
+	start_info.mod_len = xen_start_info-mod_len;
 }
 
 static void
 init_boot_params(void)
 {
-	ia64BootParamG.command_line = SWAP(ia64_boot_paramP-command_line);
-	ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP-efi_systab);
-	ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP-efi_memmap);
-	ia64BootParamG.efi_memmap_size =
-SWAP(ia64_boot_paramP-efi_memmap_size);
-	ia64BootParamG.efi_memdesc_size	=
-SWAP(ia64_boot_paramP-efi_memdesc_size);
+	ia64BootParamG.command_line = ia64_boot_paramP-command_line;
+	ia64BootParamG.efi_systab = ia64_boot_paramP-efi_systab;
+	ia64BootParamG.efi_memmap = ia64_boot_paramP-efi_memmap;
+	ia64BootParamG.efi_memmap_size = ia64_boot_paramP-efi_memmap_size;
+	ia64BootParamG.efi_memdesc_size	= ia64_boot_paramP-efi_memdesc_size;
 	ia64BootParamG.efi_memdesc_version =
-SWAP(ia64_boot_paramP-efi_memdesc_version);
+ia64_boot_paramP-efi_memdesc_version;
 	ia64BootParamG.console_info.num_cols =
-SWAP(ia64_boot_paramP-console_info.num_cols);
+ia64_boot_paramP-console_info.num_cols;
 	ia64BootParamG.console_info.num_rows =
-SWAP(ia64_boot_paramP-console_info.num_rows);
+ia64_boot_paramP-console_info.num_rows;
 	ia64BootParamG.console_info.orig_x =
-SWAP(ia64_boot_paramP-console_info.orig_x);
+ia64_boot_paramP-console_info.orig_x;
 	ia64BootParamG.console_info.orig_y =
-SWAP(ia64_boot_paramP-console_info.orig_y);
-	ia64BootParamG.fpswa = SWAP(ia64_boot_paramP-fpswa);
-	ia64BootParamG.initrd_start = SWAP(ia64_boot_paramP-initrd_start);
-	ia64BootParamG.initrd_size = SWAP(ia64_boot_paramP-initrd_size);
-	ia64BootParamG.domain_start = SWAP(ia64_boot_paramP-domain_start);
-	ia64BootParamG.domain_size = SWAP(ia64_boot_paramP-domain_size);
+ia64_boot_paramP-console_info.orig_y;
+	ia64BootParamG.fpswa = ia64_boot_paramP-fpswa;
+	ia64BootParamG.initrd_start = ia64_boot_paramP-initrd_start;
+	ia64BootParamG.initrd_size = ia64_boot_paramP-initrd_size;
+	ia64BootParamG.domain_start = 

Re: [Xen-ia64-devel] [PATCH]minios: remove big endian stuff

2008-11-18 Thread Isaku Yamahata
On Tue, Nov 18, 2008 at 10:49:01AM +0100, Dietmar Hahn wrote:
 Hi,
 
 this patch removes all the useless big endian stuff from the minios.
 Thanks.

Hi. IIRC, you are the one who wanted big endian support for PV-guest.
What is the point to remove it from the minios?


 # HG changeset patch
 # User [EMAIL PROTECTED]
 # Date 1227002151 -3600
 # Node ID 56ecdf7c49e7d86caf476da7119a8b19c5496910
 # Parent  cf3b9afb8568a18250faf08a0dd7c2b57bc7d3ac
 
 Remove the useless big endian stuff.
 
 Signed-off-by: Dietmar Hahn [EMAIL PROTECTED]
 
 diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/arch.mk
 --- a/extras/mini-os/arch/ia64/arch.mkMon Nov 17 09:27:02 2008 +0100
 +++ b/extras/mini-os/arch/ia64/arch.mkTue Nov 18 10:55:51 2008 +0100
 @@ -1,5 +1,3 @@
 -# Build for Big Endian?
 -BIGENDIAN ?= n
  
  ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
  ARCH_CFLAGS += -O2
 @@ -9,12 +7,3 @@ ARCH_ASFLAGS += -fno-builtin -fno-common
  
  ARCH_LDFLAGS = -warn-common
  
 -# Next lines are for big endian code !
 -ifeq ($(BIGENDIAN),y)
 -ARCH_CFLAGS += -mbig-endian -Wa,-mbe -Wa,-mlp64
 -ARCH_CFLAGS += -DBIG_ENDIAN
 -ARCH_ASFLAGS += -Wa,-mbe
 -ARCH_ASFLAGS += -DBIG_ENDIAN
 -ARCH_LDFLAGS = -EB -d
 -endif
 -
 diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/common.c
 --- a/extras/mini-os/arch/ia64/common.c   Mon Nov 17 09:27:02 2008 +0100
 +++ b/extras/mini-os/arch/ia64/common.c   Tue Nov 18 10:55:51 2008 +0100
 @@ -116,8 +116,8 @@ registerCallback(void)
  {
   struct callback_register event =
   {
 - .type = SWAP(CALLBACKTYPE_event),
 - .address = SWAP((unsigned long)hypervisor_callback),
 + .type = CALLBACKTYPE_event,
 + .address = (unsigned long)hypervisor_callback,
   };
   HYPERVISOR_callback_op(CALLBACKOP_register, event);
  }
 @@ -126,46 +126,44 @@ init_start_info(start_info_t* xen_start_
  init_start_info(start_info_t* xen_start_info)
  {
   /* Make a copy of the start_info structure */
 - start_info.nr_pages = SWAP(xen_start_info-nr_pages);
 - start_info.shared_info = SWAP(xen_start_info-shared_info);
 - start_info.flags = SWAP(xen_start_info-flags);
 - start_info.store_mfn = SWAP(xen_start_info-store_mfn);
 - start_info.store_evtchn = SWAP(xen_start_info-store_evtchn);
 - start_info.console.domU.mfn = SWAP(xen_start_info-console.domU.mfn);
 + start_info.nr_pages = xen_start_info-nr_pages;
 + start_info.shared_info = xen_start_info-shared_info;
 + start_info.flags = xen_start_info-flags;
 + start_info.store_mfn = xen_start_info-store_mfn;
 + start_info.store_evtchn = xen_start_info-store_evtchn;
 + start_info.console.domU.mfn = xen_start_info-console.domU.mfn;
   start_info.console.domU.evtchn =
 - SWAP(xen_start_info-console.domU.evtchn);
 - start_info.pt_base = SWAP(xen_start_info-pt_base);
 - start_info.nr_pt_frames = SWAP(xen_start_info-nr_pt_frames);
 - start_info.mfn_list = SWAP(xen_start_info-mfn_list);
 - start_info.mod_start = SWAP(xen_start_info-mod_start);
 - start_info.mod_len = SWAP(xen_start_info-mod_len);
 + xen_start_info-console.domU.evtchn;
 + start_info.pt_base = xen_start_info-pt_base;
 + start_info.nr_pt_frames = xen_start_info-nr_pt_frames;
 + start_info.mfn_list = xen_start_info-mfn_list;
 + start_info.mod_start = xen_start_info-mod_start;
 + start_info.mod_len = xen_start_info-mod_len;
  }
  
  static void
  init_boot_params(void)
  {
 - ia64BootParamG.command_line = SWAP(ia64_boot_paramP-command_line);
 - ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP-efi_systab);
 - ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP-efi_memmap);
 - ia64BootParamG.efi_memmap_size =
 - SWAP(ia64_boot_paramP-efi_memmap_size);
 - ia64BootParamG.efi_memdesc_size =
 - SWAP(ia64_boot_paramP-efi_memdesc_size);
 + ia64BootParamG.command_line = ia64_boot_paramP-command_line;
 + ia64BootParamG.efi_systab = ia64_boot_paramP-efi_systab;
 + ia64BootParamG.efi_memmap = ia64_boot_paramP-efi_memmap;
 + ia64BootParamG.efi_memmap_size = ia64_boot_paramP-efi_memmap_size;
 + ia64BootParamG.efi_memdesc_size = ia64_boot_paramP-efi_memdesc_size;
   ia64BootParamG.efi_memdesc_version =
 - SWAP(ia64_boot_paramP-efi_memdesc_version);
 + ia64_boot_paramP-efi_memdesc_version;
   ia64BootParamG.console_info.num_cols =
 - SWAP(ia64_boot_paramP-console_info.num_cols);
 + ia64_boot_paramP-console_info.num_cols;
   ia64BootParamG.console_info.num_rows =
 - SWAP(ia64_boot_paramP-console_info.num_rows);
 + ia64_boot_paramP-console_info.num_rows;
   ia64BootParamG.console_info.orig_x =
 -   

Re: [Xen-ia64-devel] [PATCH]minios: remove big endian stuff

2008-11-18 Thread Dietmar Hahn
Am Dienstag, 18. November 2008 schrieb Isaku Yamahata:
 On Tue, Nov 18, 2008 at 10:49:01AM +0100, Dietmar Hahn wrote:
  Hi,
 
  this patch removes all the useless big endian stuff from the minios.
  Thanks.

 Hi. IIRC, you are the one who wanted big endian support for PV-guest.
 What is the point to remove it from the minios?

Yes, you are right. But I never got the big endian support into the common 
parts of the mini-os so it makes no sense to have this only in the ia64 
specific sources. And as there is no open source big endian os and we stopped 
porting our BS2000 os to ia64 nobody wants that stuff in the common minos.
So I thought this looks ugly then and did this patch.
Thanks.

Dietmar.


  # HG changeset patch
  # User [EMAIL PROTECTED]
  # Date 1227002151 -3600
  # Node ID 56ecdf7c49e7d86caf476da7119a8b19c5496910
  # Parent  cf3b9afb8568a18250faf08a0dd7c2b57bc7d3ac
 
  Remove the useless big endian stuff.
 
  Signed-off-by: Dietmar Hahn [EMAIL PROTECTED]
 
  diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/arch.mk
  --- a/extras/mini-os/arch/ia64/arch.mk  Mon Nov 17 09:27:02 2008 +0100
  +++ b/extras/mini-os/arch/ia64/arch.mk  Tue Nov 18 10:55:51 2008 +0100
  @@ -1,5 +1,3 @@
  -# Build for Big Endian?
  -BIGENDIAN ?= n
 
   ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
   ARCH_CFLAGS += -O2
  @@ -9,12 +7,3 @@ ARCH_ASFLAGS += -fno-builtin -fno-common
 
   ARCH_LDFLAGS = -warn-common
 
  -# Next lines are for big endian code !
  -ifeq ($(BIGENDIAN),y)
  -ARCH_CFLAGS += -mbig-endian -Wa,-mbe -Wa,-mlp64
  -ARCH_CFLAGS += -DBIG_ENDIAN
  -ARCH_ASFLAGS += -Wa,-mbe
  -ARCH_ASFLAGS += -DBIG_ENDIAN
  -ARCH_LDFLAGS = -EB -d
  -endif
  -
  diff -r cf3b9afb8568 -r 56ecdf7c49e7 extras/mini-os/arch/ia64/common.c
  --- a/extras/mini-os/arch/ia64/common.c Mon Nov 17 09:27:02 2008 +0100
  +++ b/extras/mini-os/arch/ia64/common.c Tue Nov 18 10:55:51 2008 +0100
  @@ -116,8 +116,8 @@ registerCallback(void)
   {
  struct callback_register event =
  {
  -   .type = SWAP(CALLBACKTYPE_event),
  -   .address = SWAP((unsigned long)hypervisor_callback),
  +   .type = CALLBACKTYPE_event,
  +   .address = (unsigned long)hypervisor_callback,
  };
  HYPERVISOR_callback_op(CALLBACKOP_register, event);
   }
  @@ -126,46 +126,44 @@ init_start_info(start_info_t* xen_start_
   init_start_info(start_info_t* xen_start_info)
   {
  /* Make a copy of the start_info structure */
  -   start_info.nr_pages = SWAP(xen_start_info-nr_pages);
  -   start_info.shared_info = SWAP(xen_start_info-shared_info);
  -   start_info.flags = SWAP(xen_start_info-flags);
  -   start_info.store_mfn = SWAP(xen_start_info-store_mfn);
  -   start_info.store_evtchn = SWAP(xen_start_info-store_evtchn);
  -   start_info.console.domU.mfn = SWAP(xen_start_info-console.domU.mfn);
  +   start_info.nr_pages = xen_start_info-nr_pages;
  +   start_info.shared_info = xen_start_info-shared_info;
  +   start_info.flags = xen_start_info-flags;
  +   start_info.store_mfn = xen_start_info-store_mfn;
  +   start_info.store_evtchn = xen_start_info-store_evtchn;
  +   start_info.console.domU.mfn = xen_start_info-console.domU.mfn;
  start_info.console.domU.evtchn =
  -   SWAP(xen_start_info-console.domU.evtchn);
  -   start_info.pt_base = SWAP(xen_start_info-pt_base);
  -   start_info.nr_pt_frames = SWAP(xen_start_info-nr_pt_frames);
  -   start_info.mfn_list = SWAP(xen_start_info-mfn_list);
  -   start_info.mod_start = SWAP(xen_start_info-mod_start);
  -   start_info.mod_len = SWAP(xen_start_info-mod_len);
  +   xen_start_info-console.domU.evtchn;
  +   start_info.pt_base = xen_start_info-pt_base;
  +   start_info.nr_pt_frames = xen_start_info-nr_pt_frames;
  +   start_info.mfn_list = xen_start_info-mfn_list;
  +   start_info.mod_start = xen_start_info-mod_start;
  +   start_info.mod_len = xen_start_info-mod_len;
   }
 
   static void
   init_boot_params(void)
   {
  -   ia64BootParamG.command_line = SWAP(ia64_boot_paramP-command_line);
  -   ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP-efi_systab);
  -   ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP-efi_memmap);
  -   ia64BootParamG.efi_memmap_size =
  -   SWAP(ia64_boot_paramP-efi_memmap_size);
  -   ia64BootParamG.efi_memdesc_size =
  -   SWAP(ia64_boot_paramP-efi_memdesc_size);
  +   ia64BootParamG.command_line = ia64_boot_paramP-command_line;
  +   ia64BootParamG.efi_systab = ia64_boot_paramP-efi_systab;
  +   ia64BootParamG.efi_memmap = ia64_boot_paramP-efi_memmap;
  +   ia64BootParamG.efi_memmap_size = ia64_boot_paramP-efi_memmap_size;
  +   ia64BootParamG.efi_memdesc_size = ia64_boot_paramP-efi_memdesc_size;
  ia64BootParamG.efi_memdesc_version =
  -   SWAP(ia64_boot_paramP-efi_memdesc_version);
  +   ia64_boot_paramP-efi_memdesc_version;