Skip to content

Commit

Permalink
[IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Simon Horman authored and Tony Luck committed Mar 8, 2007
1 parent 8621235 commit 2976325
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion include/asm-ia64/kexec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions include/asm-ia64/mca.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 2976325

Please sign in to comment.