aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-04-16 13:53:40 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-05-01 14:50:55 -0400
commit27abd14bd9f1117dc7bdeee81a2de0557e077b61 (patch)
tree462a3105314af32d12d2b992037bccc11db00e5d /arch
parent31b3c9d723407b395564d1fff3624cc0083ae520 (diff)
Revert "xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'"
This reverts commit 2531d64b6fe2724dc432b67d8dc66bd45621da0b. The two patches: x86/apic: Replace io_apic_ops with x86_io_apic_ops. xen/x86: Implement x86_apic_ops take care of fixing it properly. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/mmu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index b8e279479a6b..988828b479ed 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1859,7 +1859,6 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
1859#endif /* CONFIG_X86_64 */ 1859#endif /* CONFIG_X86_64 */
1860 1860
1861static unsigned char dummy_mapping[PAGE_SIZE] __page_aligned_bss; 1861static unsigned char dummy_mapping[PAGE_SIZE] __page_aligned_bss;
1862static unsigned char fake_ioapic_mapping[PAGE_SIZE] __page_aligned_bss;
1863 1862
1864static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) 1863static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
1865{ 1864{
@@ -1900,7 +1899,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
1900 * We just don't map the IO APIC - all access is via 1899 * We just don't map the IO APIC - all access is via
1901 * hypercalls. Keep the address in the pte for reference. 1900 * hypercalls. Keep the address in the pte for reference.
1902 */ 1901 */
1903 pte = pfn_pte(PFN_DOWN(__pa(fake_ioapic_mapping)), PAGE_KERNEL); 1902 pte = pfn_pte(PFN_DOWN(__pa(dummy_mapping)), PAGE_KERNEL);
1904 break; 1903 break;
1905#endif 1904#endif
1906 1905
@@ -2065,7 +2064,6 @@ void __init xen_init_mmu_ops(void)
2065 pv_mmu_ops = xen_mmu_ops; 2064 pv_mmu_ops = xen_mmu_ops;
2066 2065
2067 memset(dummy_mapping, 0xff, PAGE_SIZE); 2066 memset(dummy_mapping, 0xff, PAGE_SIZE);
2068 memset(fake_ioapic_mapping, 0xfd, PAGE_SIZE);
2069} 2067}
2070 2068
2071/* Protected by xen_reservation_lock. */ 2069/* Protected by xen_reservation_lock. */