diff options
| author |   Andy Lutomirski <luto@kernel.org> | 2019-11-21 09:42:30 -0800 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2019-11-26 21:53:34 +0100 |
| commit | e99b6f46ee5c127d39d2f3a2682fdeef10386316 (patch) | |
| tree | eef5758f1216ba62f15e5f4a00f213840f35f08d /arch/x86/kernel | |
| parent | x86/traps: Disentangle the 32-bit and 64-bit doublefault code (diff) | |
| download | linux-dev-e99b6f46ee5c127d39d2f3a2682fdeef10386316.tar.xz linux-dev-e99b6f46ee5c127d39d2f3a2682fdeef10386316.zip | |
x86/doublefault/32: Rename doublefault.c to doublefault_32.c
doublefault.c now only contains 32-bit code. Rename it to
doublefault_32.c.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/doublefault_32.c (renamed from arch/x86/kernel/doublefault.c) | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 32acb970f416..6175e370ee4a 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -100,7 +100,9 @@ obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o obj-y += kprobes/ obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_DOUBLEFAULT) += doublefault.o +ifeq ($(CONFIG_X86_32),y) +obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o +endif obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault_32.c index 0b3c616b61a3..61c707ca8a09 100644 --- a/arch/x86/kernel/doublefault.c +++ b/arch/x86/kernel/doublefault_32.c @@ -10,8 +10,6 @@ #include <asm/processor.h> #include <asm/desc.h> -#ifdef CONFIG_X86_32 - #define DOUBLEFAULT_STACKSIZE (1024) static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE]; #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE) @@ -71,5 +69,3 @@ struct x86_hw_tss doublefault_tss __cacheline_aligned = { .__cr3 = __pa_nodebug(swapper_pg_dir), }; - -#endif |