From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 30 Nov 2012 22:11:39 +0000 (-0500)
Subject: Revert "Merge branch 'stable/pvh.v6.1' into linux-next"
X-Git-Tag: next-20121205~35^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d8e6259a91dbf0d9a87fa421e6c2abae3867666;p=karo-tx-linux.git

Revert "Merge branch 'stable/pvh.v6.1' into linux-next"

This reverts commit ca63454c05deabcfcd44b5dde7b9344b811061a8, reversing
changes made to 25cba9a9a48b0c3912461155dae88831471a89dd.
---

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index d4b23f4cda98..7ef3fa918a74 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -248,6 +248,7 @@ static int __init xen_init_events(void)
 }
 postcore_initcall(xen_init_events);
 
+
 /* In the hypervisor.S file. */
 EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);
@@ -257,4 +258,4 @@ EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);
-EXPORT_SYMBOL_GPL(privcmd_call);
\ No newline at end of file
+EXPORT_SYMBOL_GPL(privcmd_call);
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index a63e5f9a8033..4a05b398cf7d 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1486,8 +1486,7 @@ static int xen_pgd_alloc(struct mm_struct *mm)
 
 		if (user_pgd != NULL) {
 			user_pgd[pgd_index(VSYSCALL_START)] =
-				__pgd(__pa_symbol(level3_user_vsyscall) |
-				      _PAGE_TABLE);
+				__pgd(__pa(level3_user_vsyscall) | _PAGE_TABLE);
 			ret = 0;
 		}
 
@@ -1959,10 +1958,10 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
 	 * pgd.
 	 */
 	if (xen_feature(XENFEAT_writable_page_tables)) {
-		native_write_cr3(__pa_symbol(init_level4_pgt));
+		native_write_cr3(__pa(init_level4_pgt));
 	} else {
 		xen_mc_batch();
-		__xen_write_cr3(true, __pa_symbol(init_level4_pgt));
+		__xen_write_cr3(true, __pa(init_level4_pgt));
 		xen_mc_issue(PARAVIRT_LAZY_CPU);
 	}
 	/* We can't that easily rip out L3 and L2, as the Xen pagetables are
@@ -1985,10 +1984,10 @@ static RESERVE_BRK_ARRAY(pmd_t, swapper_kernel_pmd, PTRS_PER_PMD);
 
 static void __init xen_write_cr3_init(unsigned long cr3)
 {
-	unsigned long pfn = PFN_DOWN(__pa_symbol(swapper_pg_dir));
+	unsigned long pfn = PFN_DOWN(__pa(swapper_pg_dir));
 
-	BUG_ON(read_cr3() != __pa_symbol(initial_page_table));
-	BUG_ON(cr3 != __pa_symbol(swapper_pg_dir));
+	BUG_ON(read_cr3() != __pa(initial_page_table));
+	BUG_ON(cr3 != __pa(swapper_pg_dir));
 
 	/*
 	 * We are switching to swapper_pg_dir for the first time (from
@@ -2012,7 +2011,7 @@ static void __init xen_write_cr3_init(unsigned long cr3)
 	pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, pfn);
 
 	pin_pagetable_pfn(MMUEXT_UNPIN_TABLE,
-			  PFN_DOWN(__pa_symbol(initial_page_table)));
+			  PFN_DOWN(__pa(initial_page_table)));
 	set_page_prot(initial_page_table, PAGE_KERNEL);
 	set_page_prot(initial_kernel_pmd, PAGE_KERNEL);
 
@@ -2037,7 +2036,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
 
 	copy_page(initial_page_table, pgd);
 	initial_page_table[KERNEL_PGD_BOUNDARY] =
-		__pgd(__pa_symbol(initial_kernel_pmd) | _PAGE_PRESENT);
+		__pgd(__pa(initial_kernel_pmd) | _PAGE_PRESENT);
 
 	set_page_prot(initial_kernel_pmd, PAGE_KERNEL_RO);
 	set_page_prot(initial_page_table, PAGE_KERNEL_RO);
@@ -2046,8 +2045,8 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
 	pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd)));
 
 	pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE,
-			  PFN_DOWN(__pa_symbol(initial_page_table)));
-	xen_write_cr3(__pa_symbol(initial_page_table));
+			  PFN_DOWN(__pa(initial_page_table)));
+	xen_write_cr3(__pa(initial_page_table));
 
 	memblock_reserve(__pa(xen_start_info->pt_base),
 			 xen_start_info->nr_pt_frames * PAGE_SIZE);
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 3421f0d08923..0bbbccbb1f12 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -499,7 +499,7 @@ static void privcmd_close(struct vm_area_struct *vma)
 	struct page **pages = vma->vm_private_data;
 	int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 
-	if (!xen_feature(XENFEAT_auto_translated_physmap) || !numpgs || !pages)
+	if (!xen_feature(XENFEAT_auto_translated_physmap || !numpgs || !pages))
 		return;
 
 	xen_unmap_domain_mfn_range(vma, numpgs, pages);