ia64,kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
PATCH 1/1 ia64,kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
* Kexec adds some code to arch/ia64/kernel/smp.c which needs ia64_mca_pal_base, so the kexec patch (actually the kdump patch) declares this per-cpu variable in include/asm-ia64/kexec.h.
* ia64_mca_pal_base is defined in arch/ia64/kernel/mca.c, so it seems to me that it would make a lot more sense to declare it in include/asm-ia64/mca.h.
* This patch moves the declaration.
* This patch is relative to Zou Nan hai's kdump patch which I rediffed and sent to linux-ia64 and fastboot on the 8th of June
http://permalink.gmane.org/gmane.linux.ports.ia64/14320
* This patch will probably need manual merging with another patch to kexec.h that I sent yesterday, which related to removing some PTE macros. The merge should be trivial, and I'm happy to supply relative diff if need be.
http://permalink.gmane.org/gmane.linux.ports.ia64/14407
--- include/asm-ia64/kexec.h | 1 - include/asm-ia64/mca.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-)
include/asm-ia64/kexec.h +0 -1
@@ -20,7 +20,6 @@ #define pte_bits 3#define vmlpt_bits (impl_va_bits - PAGE_SHIFT + pte_bits)#define POW2 (n) (1ULL << (n)) -DECLARE_PER_CPU (u64, ia64_mca_pal_base);const extern unsigned int relocate_new_kernel_size;volatile extern long kexec_rendez; extern void relocate_new_kernel(unsigned long, unsigned long,
include/asm-ia64/mca.h +2 -0
@@ -23,6 +23,8 @@ #include <asm/mca_asm.h>#define IA64_MCA_RENDEZ_TIMEOUT (20 * 1000)/* value in milliseconds - 20 seconds */ +DECLARE_PER_CPU (u64, ia64_mca_pal_base); + typedef struct ia64_fptr { unsigned long fp; unsigned long gp;
Signature · 1 line
1.4.0