Commit:     0fcdf96ca95f81a0e1fd91a2de16dc67c641c958
Parent:     b67405bbbba6bbd28dfd5337b29d5bc5a1140afb
Author:     Simon Horman <[EMAIL PROTECTED]>
AuthorDate: Tue May 15 01:41:15 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 15 08:54:00 2007 -0700

    alpha: fix hard_smp_processor_id compile error
    "Remove hardcoding of hard_smp_processor_id on UP systems",
    2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f in Linus' tree, moved
    the definition of hard_smp_processor_id linux/smp.h to asm/smp.h
    for UP systems. This causes a regression on Alpha.
    cc1: warnings being treated as errors
    arch/alpha/kernel/setup.c: In function 'setup_arch':
    arch/alpha/kernel/setup.c:506: warning: implicit declaration of function 
    make[1]: *** [arch/alpha/kernel/setup.o] error 1
    make: *** [arch/alpha/kernel] error 2
    By including asm/smp.h non-conditionally in asm/mmu_context.h
    the problem appears to be resolved.
    Cc: Fernando Luis Vazquez Cao <[EMAIL PROTECTED]>
    Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
    Cc: Richard Henderson <[EMAIL PROTECTED]>
    Cc: Ivan Kokshaysky <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-alpha/mmu_context.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h
index 0bd7bd2..6a5be1f 100644
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
@@ -85,8 +85,8 @@ __reload_thread(struct pcb_struct *pcb)
  * +-------------+----------------+--------------+
-#ifdef CONFIG_SMP
 #include <asm/smp.h>
+#ifdef CONFIG_SMP
 #define cpu_last_asn(cpuid)    (cpu_data[cpuid].last_asn)
 extern unsigned long last_asn;
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

Reply via email to