From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Wed, 14 Jun 2006 22:05:42 +0000 (-0600)
Subject: [IA64] Remove redundant ASSIGN_DOMAIN_MACH_PAGE in dom_fw.c
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15968
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f34410a2229b931e5a870bf24b538597c977877;p=xen.git

[IA64] Remove redundant ASSIGN_DOMAIN_MACH_PAGE in dom_fw.c

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
---

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index a87830458d..12b5c2f42e 100644
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -596,18 +596,11 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f
 		efi_tables[i].table = 0;
 	}
 	if (d == dom0) {
-#ifdef CONFIG_XEN_IA64_DOM0_VP
-# define ASSIGN_DOMAIN_MACH_PAGE(d, p) \
-        assign_domain_mach_page((d), (p), PAGE_SIZE, ASSIGN_readonly)
-#else
-# define ASSIGN_DOMAIN_MACH_PAGE(d, p) (p)
-#endif
-
 		printf("Domain0 EFI passthrough:");
 		i = 1;
 		if (efi.mps) {
 			efi_tables[i].guid = MPS_TABLE_GUID;
-			efi_tables[i].table = ASSIGN_DOMAIN_MACH_PAGE(d, __pa(efi.mps));
+			efi_tables[i].table = __pa(efi.mps);
 			printf(" MPS=0x%lx",efi_tables[i].table);
 			i++;
 		}
@@ -616,25 +609,25 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f
 
 		if (efi.acpi20) {
 			efi_tables[i].guid = ACPI_20_TABLE_GUID;
-			efi_tables[i].table = ASSIGN_DOMAIN_MACH_PAGE(d, __pa(efi.acpi20));
+			efi_tables[i].table = __pa(efi.acpi20);
 			printf(" ACPI 2.0=0x%lx",efi_tables[i].table);
 			i++;
 		}
 		if (efi.acpi) {
 			efi_tables[i].guid = ACPI_TABLE_GUID;
-			efi_tables[i].table = ASSIGN_DOMAIN_MACH_PAGE(d, __pa(efi.acpi));
+			efi_tables[i].table = __pa(efi.acpi);
 			printf(" ACPI=0x%lx",efi_tables[i].table);
 			i++;
 		}
 		if (efi.smbios) {
 			efi_tables[i].guid = SMBIOS_TABLE_GUID;
-			efi_tables[i].table = ASSIGN_DOMAIN_MACH_PAGE(d, __pa(efi.smbios));
+			efi_tables[i].table = __pa(efi.smbios);
 			printf(" SMBIOS=0x%lx",efi_tables[i].table);
 			i++;
 		}
 		if (efi.hcdp) {
 			efi_tables[i].guid = HCDP_TABLE_GUID;
-			efi_tables[i].table = ASSIGN_DOMAIN_MACH_PAGE(d, __pa(efi.hcdp));
+			efi_tables[i].table = __pa(efi.hcdp);
 			printf(" HCDP=0x%lx",efi_tables[i].table);
 			i++;
 		}