Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 163f6876 authored by Huang Ying's avatar Huang Ying Committed by Linus Torvalds
Browse files

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE 



Rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE, because control
page is used for not only code on some platform.  For example in kexec
jump, it is used for data and stack too.

[akpm@linux-foundation.org: unbreak powerpc and arm, finish conversion]
Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ade3fcc

arch/arm/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
/* Maximum address we can use for the control code buffer */

#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)



#define KEXEC_CONTROL_CODE_SIZE	4096

#define KEXEC_CONTROL_PAGE_SIZE	4096



#define KEXEC_ARCH KEXEC_ARCH_ARM

arch/arm/kernel/machine_kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void machine_kexec(struct kimage *image) 




	flush_icache_range((unsigned long) reboot_code_buffer,

			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);

			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);

	printk(KERN_INFO "Bye!\n");



	cpu_proc_fin();

arch/ia64/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
/* Maximum address we can use for the control code buffer */

#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE



#define KEXEC_CONTROL_CODE_SIZE (8192 + 8192 + 4096)

#define KEXEC_CONTROL_PAGE_SIZE (8192 + 8192 + 4096)



/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_IA_64

arch/powerpc/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE

#endif



#define KEXEC_CONTROL_CODE_SIZE 4096

#define KEXEC_CONTROL_PAGE_SIZE 4096



/* The native architecture */

#ifdef __powerpc64__

arch/powerpc/kernel/machine_kexec_32.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void default_machine_kexec(struct kimage *image) 
						relocate_new_kernel_size);



	flush_icache_range(reboot_code_buffer,

				reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);

				reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);

	printk(KERN_INFO "Bye!\n");



	/* now call it */