Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=297632544a7a761144636accdb558db9d99a3647
Commit:     297632544a7a761144636accdb558db9d99a3647
Parent:     8621235b2ede3276e9862540f0188e40471a99f7
Author:     Simon Horman <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 14 16:17:47 2007 +0900
Committer:  Tony Luck <[EMAIL PROTECTED]>
CommitDate: Thu Mar 8 10:18:24 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
 include/asm-ia64/kexec.h |    1 -
 include/asm-ia64/mca.h   |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/asm-ia64/kexec.h b/include/asm-ia64/kexec.h
index f2ad469..41299dd 100644
--- a/include/asm-ia64/kexec.h
+++ b/include/asm-ia64/kexec.h
@@ -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);
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index ee97f7c..41098f4 100644
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to