diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-28 08:47:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 12:07:24 +0200 |
| commit | 64b163fab684e3de47aa8db6cc08ae7d2e194373 (patch) | |
| tree | ebb2769a705ac422f6f27461c3d52b6bc96fa9ab /arch/x86/xen | |
| parent | 73285527804402befe5d5140aeede21c16544b4c (diff) | |
| download | blackbird-op-linux-64b163fab684e3de47aa8db6cc08ae7d2e194373.tar.gz blackbird-op-linux-64b163fab684e3de47aa8db6cc08ae7d2e194373.zip | |
x86/idt: Unify gate_struct handling for 32/64-bit kernels
The first 32 bits of gate struct are the same for 32 and 64 bit kernels.
The 32-bit version uses desc_struct and no designated data structure,
so we need different accessors for 32 and 64 bit kernels.
Aside of that the macros which are necessary to build the 32-bit
gate descriptor are horrible to read.
Unify the gate structs and switch all code fiddling with it over.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20170828064957.861974317@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 98491521bb43..4c5d72b8aada 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -584,12 +584,12 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val, { unsigned long addr; - if (val->type != GATE_TRAP && val->type != GATE_INTERRUPT) + if (val->bits.type != GATE_TRAP && val->bits.type != GATE_INTERRUPT) return 0; info->vector = vector; - addr = gate_offset(*val); + addr = gate_offset(val); #ifdef CONFIG_X86_64 /* * Look for known traps using IST, and substitute them @@ -622,16 +622,16 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val, ; else { /* Some other trap using IST? */ - if (WARN_ON(val->ist != 0)) + if (WARN_ON(val->bits.ist != 0)) return 0; } #endif /* CONFIG_X86_64 */ info->address = addr; - info->cs = gate_segment(*val); - info->flags = val->dpl; + info->cs = gate_segment(val); + info->flags = val->bits.dpl; /* interrupt gates clear IF */ - if (val->type == GATE_INTERRUPT) + if (val->bits.type == GATE_INTERRUPT) info->flags |= 1 << 2; return 1; |
