diff options
| author | Huang Ying <ying.huang@intel.com> | 2009-03-10 03:57:16 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-03-11 02:13:25 +0100 |
| commit | fee7b0d84cc8c7bc5dc212901c79e93eaf83a5b5 (patch) | |
| tree | f855b0b5057c3dff7e26c840218cb22bfe965a7a /arch/x86/include/asm/kexec.h | |
| parent | x86, kexec: x86_64: add identity map for pages at image->start (diff) | |
| download | linux-fee7b0d84cc8c7bc5dc212901c79e93eaf83a5b5.tar.xz linux-fee7b0d84cc8c7bc5dc212901c79e93eaf83a5b5.zip | |
x86, kexec: x86_64: add kexec jump support for x86_64
Impact: New major feature
This patch add kexec jump support for x86_64. More information about
kexec jump can be found in corresponding x86_32 support patch.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/kexec.h')
| -rw-r--r-- | arch/x86/include/asm/kexec.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index 0ceb6d19ed30..317ff1703d0b 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -9,13 +9,13 @@ # define PAGES_NR 4 #else # define PA_CONTROL_PAGE 0 -# define PA_TABLE_PAGE 1 -# define PAGES_NR 2 +# define VA_CONTROL_PAGE 1 +# define PA_TABLE_PAGE 2 +# define PA_SWAP_PAGE 3 +# define PAGES_NR 4 #endif -#ifdef CONFIG_X86_32 # define KEXEC_CONTROL_CODE_MAX_SIZE 2048 -#endif #ifndef __ASSEMBLY__ @@ -136,10 +136,11 @@ relocate_kernel(unsigned long indirection_page, unsigned int has_pae, unsigned int preserve_context); #else -NORET_TYPE void +unsigned long relocate_kernel(unsigned long indirection_page, unsigned long page_list, - unsigned long start_address) ATTRIB_NORET; + unsigned long start_address, + unsigned int preserve_context); #endif #define ARCH_HAS_KIMAGE_ARCH |