diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-06-03 13:37:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 18:51:28 +0200 |
| commit | 905a36a2851838bca5a424fb758e201990234e6e (patch) | |
| tree | fcd6c5f94a7cd929fafd46c6b1b868d6e55a72da /arch | |
| parent | x86/asm/entry/64: Fold identical code paths (diff) | |
| download | linux-dev-905a36a2851838bca5a424fb758e201990234e6e.tar.xz linux-dev-905a36a2851838bca5a424fb758e201990234e6e.zip | |
x86/asm/entry: Move entry_64.S and entry_32.S to arch/x86/entry/
Create a new directory hierarchy for the low level x86 entry code:
arch/x86/entry/*
This will host all the low level glue that is currently scattered
all across arch/x86/.
Start with entry_64.S and entry_32.S.
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/Kbuild | 3 | ||||
| -rw-r--r-- | arch/x86/entry/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/entry/entry_32.S (renamed from arch/x86/kernel/entry_32.S) | 0 | ||||
| -rw-r--r-- | arch/x86/entry/entry_64.S (renamed from arch/x86/kernel/entry_64.S) | 0 | ||||
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
5 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 3942f74c92d7..b9b816277e72 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -1,3 +1,6 @@ + +obj-y += entry/ + obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile new file mode 100644 index 000000000000..fa7e0cf6d3c4 --- /dev/null +++ b/arch/x86/entry/Makefile @@ -0,0 +1,4 @@ +# +# Makefile for the x86 low level entry code +# +obj-y := entry_$(BITS).o diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/entry/entry_32.S index 0ac73de925d1..0ac73de925d1 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/entry/entry_32.S diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/entry/entry_64.S index 4ad79e946f5a..4ad79e946f5a 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/entry/entry_64.S diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 9bcd0b56ca17..9d3ee054453d 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -22,7 +22,7 @@ KASAN_SANITIZE_dumpstack_$(BITS).o := n CFLAGS_irq.o := -I$(src)/../include/asm/trace -obj-y := process_$(BITS).o signal.o entry_$(BITS).o +obj-y := process_$(BITS).o signal.o obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o |