summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.S2
-rw-r--r--arch/x86/entry/ia32entry.S2
-rw-r--r--arch/x86/entry/thunk_64.S2
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. */