diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-14 09:36:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-14 09:36:20 +0100 |
| commit | c41ec71316fd5923b7a436886b0d92daeb4683f1 (patch) | |
| tree | b69b1636cf401907da7d1ea247576609cca33a00 /arch/x86/xen | |
| parent | e66b4ac264a5029fa9409d9d9f67c79a15ffd618 (diff) | |
| parent | 1f2cbcf648962cdcf511d234cb39745baa9f5d07 (diff) | |
Merge branch 'x86/vdso'
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/mmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 256282e7888b..21c6a420e19a 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -2058,7 +2058,6 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) case FIX_RO_IDT: #ifdef CONFIG_X86_32 case FIX_WP_TEST: - case FIX_VDSO: # ifdef CONFIG_HIGHMEM case FIX_KMAP_BEGIN ... FIX_KMAP_END: # endif |