diff options
| author | Ingo Molnar | 2016-04-29 11:55:04 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2016-04-29 11:55:04 +0200 |
| commit | ffc5fce9a96303c3e16232a6bdf8827af6adb604 (patch) | |
| tree | c8c46b2af268d27e07ee7fad8c283fa7d31b1fb7 /arch/x86/kernel/head_32.S | |
| parent | Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict (diff) | |
| parent | x86/apic: Handle zero vector gracefully in clear_vector_irq() (diff) | |
| download | kernel-qcow2-linux-ffc5fce9a96303c3e16232a6bdf8827af6adb604.tar.gz kernel-qcow2-linux-ffc5fce9a96303c3e16232a6bdf8827af6adb604.tar.xz kernel-qcow2-linux-ffc5fce9a96303c3e16232a6bdf8827af6adb604.zip | |
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/head_32.S')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 6770865fde6b..6f8902b0d151 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: /* |