adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

kexec jump: rename KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE

Browse source 
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: Huang 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Huang Ying 2008-08-15 00:40:22 -07:00 committed by Linus Torvalds
parent 7ade3fcc1f
commit 163f6876f5
12 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/kexec.h
View file

@ -10,7 +10,7 @@
/* Maximum address we can use for the control code buffer */ /* Maximum address we can use for the control code buffer */
#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) #define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
#define KEXEC_CONTROL_CODE_SIZE 4096 #define KEXEC_CONTROL_PAGE_SIZE 4096
#define KEXEC_ARCH KEXEC_ARCH_ARM #define KEXEC_ARCH KEXEC_ARCH_ARM

2
arch/arm/kernel/machine_kexec.c
View file

@ -71,7 +71,7 @@ void machine_kexec(struct kimage *image)
flush_icache_range((unsigned long) reboot_code_buffer, 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"); printk(KERN_INFO "Bye!\n");
cpu_proc_fin(); cpu_proc_fin();

2
arch/ia64/include/asm/kexec.h
View file

@ -9,7 +9,7 @@
/* Maximum address we can use for the control code buffer */ /* Maximum address we can use for the control code buffer */
#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE #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 */ /* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_IA_64 #define KEXEC_ARCH KEXEC_ARCH_IA_64

2
arch/powerpc/include/asm/kexec.h
View file

@ -22,7 +22,7 @@
#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
#endif #endif
#define KEXEC_CONTROL_CODE_SIZE 4096 #define KEXEC_CONTROL_PAGE_SIZE 4096
/* The native architecture */ /* The native architecture */
#ifdef __powerpc64__ #ifdef __powerpc64__

2
arch/powerpc/kernel/machine_kexec_32.c
View file

@ -51,7 +51,7 @@ void default_machine_kexec(struct kimage *image)
relocate_new_kernel_size); relocate_new_kernel_size);
flush_icache_range(reboot_code_buffer, 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"); printk(KERN_INFO "Bye!\n");
/* now call it */ /* now call it */

2
arch/s390/include/asm/kexec.h
View file

@ -31,7 +31,7 @@
#define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31) #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
/* Allocate one page for the pdp and the second for the code */ /* Allocate one page for the pdp and the second for the code */
#define KEXEC_CONTROL_CODE_SIZE 4096 #define KEXEC_CONTROL_PAGE_SIZE 4096
/* The native architecture */ /* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_S390 #define KEXEC_ARCH KEXEC_ARCH_S390

2
arch/sh/include/asm/kexec.h
View file

@ -21,7 +21,7 @@
/* Maximum address we can use for the control code buffer */ /* Maximum address we can use for the control code buffer */
#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
#define KEXEC_CONTROL_CODE_SIZE 4096 #define KEXEC_CONTROL_PAGE_SIZE 4096
/* The native architecture */ /* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_SH #define KEXEC_ARCH KEXEC_ARCH_SH

2
arch/x86/kernel/machine_kexec_32.c
View file

@ -78,7 +78,7 @@ static void load_segments(void)
/* /*
* A architecture hook called to validate the * A architecture hook called to validate the
* proposed image and prepare the control pages * proposed image and prepare the control pages
* as needed. The pages for KEXEC_CONTROL_CODE_SIZE * as needed. The pages for KEXEC_CONTROL_PAGE_SIZE
* have been allocated, but the segments have yet * have been allocated, but the segments have yet
* been copied into the kernel. * been copied into the kernel.
* *

2
include/asm-mips/kexec.h
View file

@ -16,7 +16,7 @@
/* Maximum address we can use for the control code buffer */ /* Maximum address we can use for the control code buffer */
#define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000) #define KEXEC_CONTROL_MEMORY_LIMIT (0x20000000)
#define KEXEC_CONTROL_CODE_SIZE 4096 #define KEXEC_CONTROL_PAGE_SIZE 4096
/* The native architecture */ /* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_MIPS #define KEXEC_ARCH KEXEC_ARCH_MIPS

4
include/asm-x86/kexec.h
View file

@ -63,7 +63,7 @@
/* Maximum address we can use for the control code buffer */ /* Maximum address we can use for the control code buffer */
# define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE # define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
# define KEXEC_CONTROL_CODE_SIZE 4096 # define KEXEC_CONTROL_PAGE_SIZE 4096
/* The native architecture */ /* The native architecture */
# define KEXEC_ARCH KEXEC_ARCH_386 # define KEXEC_ARCH KEXEC_ARCH_386
@ -79,7 +79,7 @@
# define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL) # define KEXEC_CONTROL_MEMORY_LIMIT (0xFFFFFFFFFFUL)
/* Allocate one page for the pdp and the second for the code */ /* 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 */ /* The native architecture */
# define KEXEC_ARCH KEXEC_ARCH_X86_64 # define KEXEC_ARCH KEXEC_ARCH_X86_64

4
include/linux/kexec.h
View file

@ -25,8 +25,8 @@
#error KEXEC_CONTROL_MEMORY_LIMIT not defined #error KEXEC_CONTROL_MEMORY_LIMIT not defined
#endif #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 #endif
#ifndef KEXEC_ARCH #ifndef KEXEC_ARCH

6
kernel/kexec.c
View file

@ -77,7 +77,7 @@ int kexec_should_crash(struct task_struct *p)
* *
* The code for the transition from the current kernel to the * The code for the transition from the current kernel to the
* the new kernel is placed in the control_code_buffer, whose size * the new kernel is placed in the control_code_buffer, whose size
* is given by KEXEC_CONTROL_CODE_SIZE. In the best case only a single * is given by KEXEC_CONTROL_PAGE_SIZE. In the best case only a single
* page of memory is necessary, but some architectures require more. * page of memory is necessary, but some architectures require more.
* Because this memory must be identity mapped in the transition from * Because this memory must be identity mapped in the transition from
* virtual to physical addresses it must live in the range * virtual to physical addresses it must live in the range
@ -242,7 +242,7 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
*/ */
result = -ENOMEM; result = -ENOMEM;
image->control_code_page = kimage_alloc_control_pages(image, image->control_code_page = kimage_alloc_control_pages(image,
get_order(KEXEC_CONTROL_CODE_SIZE)); get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) { if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n"); printk(KERN_ERR "Could not allocate control_code_buffer\n");
goto out; goto out;
@ -317,7 +317,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
*/ */
result = -ENOMEM; result = -ENOMEM;
image->control_code_page = kimage_alloc_control_pages(image, image->control_code_page = kimage_alloc_control_pages(image,
get_order(KEXEC_CONTROL_CODE_SIZE)); get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) { if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n"); printk(KERN_ERR "Could not allocate control_code_buffer\n");
goto out; goto out;