diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
| commit | 8b53b57576292b92b27769f9e213df19b6e57786 (patch) | |
| tree | cd851ce4fa71b2653f120d7f11a9c6cbcf311b19 /arch/powerpc/include/asm/kexec.h | |
| parent | ab7e79243746e2a9c5f00243e60108189c44c9eb (diff) | |
| parent | 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf (diff) | |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 @@ | |||
| 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | #define KEXEC_CONTROL_CODE_SIZE 4096 | 25 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
| 26 | 26 | ||
| 27 | /* The native architecture */ | 27 | /* The native architecture */ |
| 28 | #ifdef __powerpc64__ | 28 | #ifdef __powerpc64__ |