diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c b/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c index 16a0155ecb..4939ab106e 100644 --- a/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c @@ -282,12 +282,6 @@ static int spurious_fault(struct pt_regs *regs, pmd_t *pmd; pte_t *pte; -#ifdef CONFIG_XEN - /* Faults in hypervisor area are never spurious. */ - if (address >= HYPERVISOR_VIRT_START) - return 0; -#endif - /* Reserved-bit violation or user access to kernel space? */ if (error_code & 0x0c) return 0; @@ -372,7 +366,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, if (unlikely(address >= TASK_SIZE)) { #ifdef CONFIG_XEN /* Faults in hypervisor area can never be patched up. */ - if (address >= HYPERVISOR_VIRT_START) + if (address >= hypervisor_virt_start) goto bad_area_nosemaphore; #endif if (!(error_code & 5)) |