diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-28 04:17:07 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-28 04:17:07 +0200 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /arch/powerpc/include/asm/kexec.h | |
| parent | x86: use X86_FEATURE_NOPL in alternatives (diff) | |
| parent | x86: update defconfigs (diff) | |
| download | linux-b30a72a7edfc64c8929104d5c2178aca489aa559.tar.xz linux-b30a72a7edfc64c8929104d5c2178aca489aa559.zip | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'arch/powerpc/include/asm/kexec.h')
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index acdcdc66f1b6..3736d9b33289 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -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__ |