diff options
| author |   Dave Hansen <dave.hansen@linux.intel.com> | 2014-09-11 14:15:11 -0700 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@linux.intel.com> | 2014-09-11 14:30:01 -0700 |
| commit | c8128cceb4f4b02c53096cb173628184c7e9bc36 (patch) | |
| tree | 670940085ab481430428d4ff707566a8dae734e7 /arch/x86/kernel/machine_kexec_32.c | |
| parent | Linux 3.17-rc4 (diff) | |
| download | linux-dev-c8128cceb4f4b02c53096cb173628184c7e9bc36.tar.xz linux-dev-c8128cceb4f4b02c53096cb173628184c7e9bc36.zip | |
x86: Axe the lightly-used cpu_has_pae
cpu_has_pae is only referenced in one place: the X86_32 kexec
code (in a file not even built on 64-bit). It hardly warrants
its own macro, or the trouble we go to ensuring that it can't
be called in X86_64 code.
Axe the macro and replace it with a direct cpu feature check.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: http://lkml.kernel.org/r/20140911211511.AD76E774@viggo.jf.intel.com
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/machine_kexec_32.c')
| -rw-r--r-- | arch/x86/kernel/machine_kexec_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index 1667b1de8d5d..72e8e310258d 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c @@ -247,7 +247,8 @@ void machine_kexec(struct kimage *image) /* now call it */ image->start = relocate_kernel_ptr((unsigned long)image->head, (unsigned long)page_list, - image->start, cpu_has_pae, + image->start, + boot_cpu_has(X86_FEATURE_PAE), image->preserve_context); #ifdef CONFIG_KEXEC_JUMP |