summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk2012-02-10 15:24:08 +0100
committerKonrad Rzeszutek Wilk2012-02-20 16:40:54 +0100
commit416d7214741daba3acd6d328289858390bef37bc (patch)
tree9b891f5952ecc1376cffcae1eea6522f39039bfd
parentxenbus_dev: add missing error check to watch handling (diff)
downloadkernel-qcow2-linux-416d7214741daba3acd6d328289858390bef37bc.tar.gz
kernel-qcow2-linux-416d7214741daba3acd6d328289858390bef37bc.tar.xz
kernel-qcow2-linux-416d7214741daba3acd6d328289858390bef37bc.zip
xen/setup: Remove redundant filtering of PTE masks.
commit 7347b4082e55ac4a673f06a0a0ce25c37273c9ec "xen: Allow unprivileged Xen domains to create iomap pages" added a redundant line in the early bootup code to filter out the PTE. That filtering is already done a bit earlier so this extra processing is not required. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/xen/enlighten.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 12eb07bfb267..7c44e1bf981e 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1204,10 +1204,6 @@ asmlinkage void __init xen_start_kernel(void)
pgd = (pgd_t *)xen_start_info->pt_base;
- if (!xen_initial_domain())
- __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
-
- __supported_pte_mask |= _PAGE_IOMAP;
/* Don't do the full vcpu_info placement stuff until we have a
possible map and a non-dummy shared_info. */
per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];