diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-29 11:55:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-29 11:55:04 +0200 |
| commit | ffc5fce9a96303c3e16232a6bdf8827af6adb604 (patch) | |
| tree | c8c46b2af268d27e07ee7fad8c283fa7d31b1fb7 /arch/x86/kernel | |
| parent | b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc (diff) | |
| parent | 1bdb8970392a68489b469c3a330a1adb5ef61beb (diff) | |
| download | op-kernel-dev-ffc5fce9a96303c3e16232a6bdf8827af6adb604.zip op-kernel-dev-ffc5fce9a96303c3e16232a6bdf8827af6adb604.tar.gz | |
Merge branch 'x86/urgent' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/apic/vector.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/head_32.S | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index 26d3ccc..a5e400a 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -256,7 +256,8 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data) struct irq_desc *desc; int cpu, vector; - BUG_ON(!data->cfg.vector); + if (!data->cfg.vector) + return; vector = data->cfg.vector; for_each_cpu_and(cpu, data->domain, cpu_online_mask) diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 6770865..6f8902b 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -389,12 +389,6 @@ default_entry: /* Make changes effective */ wrmsr - /* - * And make sure that all the mappings we set up have NX set from - * the beginning. - */ - orl $(1 << (_PAGE_BIT_NX - 32)), pa(__supported_pte_mask + 4) - enable_paging: /* |
