3 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-mips/kexec.h b/include/asm-mips/kexec.h
index cdbab43b7d3a..4314892aaebb 100644
--- a/include/asm-mips/kexec.h
+++ b/include/asm-mips/kexec.h
@@ -16,7 +16,7 @@
 /* Maximum address we can use for the control code buffer */
 #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)
-#define KEXEC_CONTROL_CODE_SIZE 4096
+#define KEXEC_CONTROL_PAGE_SIZE 4096
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_MIPS
diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h
index c0e52a14fd4d..f6fb3d21883c 100644
--- a/include/asm-x86/kexec.h
+++ b/include/asm-x86/kexec.h
@@ -63,7 +63,7 @@
 /* Maximum address we can use for the control code buffer */
 # define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
-# define KEXEC_CONTROL_CODE_SIZE        4096
+# define KEXEC_CONTROL_PAGE_SIZE        4096
 /* The native architecture */
 # define KEXEC_ARCH KEXEC_ARCH_386
@@ -79,7 +79,7 @@
 # define KEXEC_CONTROL_MEMORY_LIMIT     (0xFFFFFFFFFFUL)
 /* Allocate one page for the pdp and the second for the code */
-# define KEXEC_CONTROL_CODE_SIZE  (4096UL + 4096UL)
+# define KEXEC_CONTROL_PAGE_SIZE  (4096UL + 4096UL)
 /* The native architecture */
 # define KEXEC_ARCH KEXEC_ARCH_X86_64
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 32110cede64f..17f76fc05173 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -25,8 +25,8 @@
 #error KEXEC_CONTROL_MEMORY_LIMIT not defined
 #endif
-#ifndef KEXEC_CONTROL_CODE_SIZE
+#ifndef KEXEC_CONTROL_PAGE_SIZE
-#error KEXEC_CONTROL_CODE_SIZE not defined
+#error KEXEC_CONTROL_PAGE_SIZE not defined
 #endif
 #ifndef KEXEC_ARCH

diff --git a/include/asm-mips/kexec.h b/include/asm-mips/kexec.h index cdbab43b7d3a..4314892aaebb 100644 --- a/include/asm-mips/kexec.h +++ b/include/asm-mips/kexec.h
@@ -16,7 +16,7 @@
16	/* Maximum address we can use for the control code buffer */	16	/* Maximum address we can use for the control code buffer */
17	#define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)	17	#define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)
18		18
19	#define KEXEC_CONTROL_CODE_SIZE 4096	19	#define KEXEC_CONTROL_PAGE_SIZE 4096
20		20
21	/* The native architecture */	21	/* The native architecture */
22	#define KEXEC_ARCH KEXEC_ARCH_MIPS	22	#define KEXEC_ARCH KEXEC_ARCH_MIPS


diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h index c0e52a14fd4d..f6fb3d21883c 100644 --- a/include/asm-x86/kexec.h +++ b/include/asm-x86/kexec.h
@@ -63,7 +63,7 @@
63	/* Maximum address we can use for the control code buffer */	63	/* Maximum address we can use for the control code buffer */
64	# define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE	64	# define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
65		65
66	# define KEXEC_CONTROL_CODE_SIZE 4096	66	# define KEXEC_CONTROL_PAGE_SIZE 4096
67		67
68	/* The native architecture */	68	/* The native architecture */
69	# define KEXEC_ARCH KEXEC_ARCH_386	69	# define KEXEC_ARCH KEXEC_ARCH_386
@@ -79,7 +79,7 @@
79	# define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL)	79	# define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL)
80		80
81	/* Allocate one page for the pdp and the second for the code */	81	/* Allocate one page for the pdp and the second for the code */
82	# define KEXEC_CONTROL_CODE_SIZE (4096UL + 4096UL)	82	# define KEXEC_CONTROL_PAGE_SIZE (4096UL + 4096UL)
83		83
84	/* The native architecture */	84	/* The native architecture */
85	# define KEXEC_ARCH KEXEC_ARCH_X86_64	85	# define KEXEC_ARCH KEXEC_ARCH_X86_64


diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 32110cede64f..17f76fc05173 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h
@@ -25,8 +25,8 @@
25	#error KEXEC_CONTROL_MEMORY_LIMIT not defined	25	#error KEXEC_CONTROL_MEMORY_LIMIT not defined
26	#endif	26	#endif
27		27
28	#ifndef KEXEC_CONTROL_CODE_SIZE	28	#ifndef KEXEC_CONTROL_PAGE_SIZE
29	#error KEXEC_CONTROL_CODE_SIZE not defined	29	#error KEXEC_CONTROL_PAGE_SIZE not defined
30	#endif	30	#endif
31		31
32	#ifndef KEXEC_ARCH	32	#ifndef KEXEC_ARCH