diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 18:29:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-04 07:37:36 +0200 |
| commit | d36f947904dba0935a0e74dc9df2ef57caeb7d03 (patch) | |
| tree | 9358fcef23bef7b9201d21615b8f2e8b9271b924 | |
| parent | e6b93f4e48af8fe8373ec1132b8c7787890e7578 (diff) | |
| download | linux-d36f947904dba0935a0e74dc9df2ef57caeb7d03.tar.gz linux-d36f947904dba0935a0e74dc9df2ef57caeb7d03.tar.bz2 linux-d36f947904dba0935a0e74dc9df2ef57caeb7d03.zip | |
x86/asm/entry: Move arch/x86/include/asm/calling.h to arch/x86/entry/
asm/calling.h is private to the entry code, make this more apparent
by moving it to the new arch/x86/entry/ directory.
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>
| -rw-r--r-- | arch/x86/entry/calling.h (renamed from arch/x86/include/asm/calling.h) | 0 | ||||
| -rw-r--r-- | arch/x86/entry/entry_64.S | 2 | ||||
| -rw-r--r-- | arch/x86/entry/ia32entry.S | 2 | ||||
| -rw-r--r-- | arch/x86/entry/thunk_64.S | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/entry/calling.h index f4e6308c4200..f4e6308c4200 100644 --- a/arch/x86/include/asm/calling.h +++ b/arch/x86/entry/calling.h diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 4ad79e946f5a..f7380ea75777 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -28,7 +28,7 @@ #include <asm/segment.h> #include <asm/cache.h> #include <asm/errno.h> -#include <asm/calling.h> +#include "calling.h" #include <asm/asm-offsets.h> #include <asm/msr.h> #include <asm/unistd.h> diff --git a/arch/x86/entry/ia32entry.S b/arch/x86/entry/ia32entry.S index 2be23c734db5..f16767417385 100644 --- a/arch/x86/entry/ia32entry.S +++ b/arch/x86/entry/ia32entry.S @@ -4,7 +4,7 @@ * Copyright 2000-2002 Andi Kleen, SuSE Labs. */ -#include <asm/calling.h> +#include "calling.h" #include <asm/asm-offsets.h> #include <asm/current.h> #include <asm/errno.h> diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index 10f555e435e1..3e95681b4e2d 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -6,7 +6,7 @@ * Subject to the GNU public license, v.2. No warranty of any kind. */ #include <linux/linkage.h> -#include <asm/calling.h> +#include "calling.h" #include <asm/asm.h> /* rdi: arg1 ... normal C conventions. rax is saved/restored. */ |