Commit 29763254 authored Feb 14, 2007 by Simon Horman Committed by Tony Luck Mar 08, 2007

[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.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>

parent 8621235b

include/asm-ia64/kexec.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		} while(0)

		extern struct kimage *ia64_kimage;
		DECLARE_PER_CPU(u64, ia64_mca_pal_base);
		extern const unsigned int relocate_new_kernel_size;
		extern void relocate_new_kernel(unsigned long, unsigned long,
		struct ia64_boot_param *, unsigned long);

include/asm-ia64/mca.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ struct ia64_mca_notify_die {
		int *monarch_cpu;
		};

		DECLARE_PER_CPU(u64, ia64_mca_pal_base);

		#else /* __ASSEMBLY__ */

		#define IA64_MCA_CORRECTED 0x0 /* Error has been corrected by OS_MCA */

Admin message