[SPARC32]: Rename cpuid functions

smp_processor_id is to be used when current_thread_info()->cpu is
valid; i.e. almost always.  Early on or when setting that field,
hard_smp_processor_id is used.  Clarify the distinction and only
export to modules what's really needed.  smp_processor_id is not
model-specific, so we no longer need btfixups for it.

diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 14c8192eeaac60ad2f48806b56c3440147a404a9..c17691c17fe84a6d7c540c5ba2ddb638190ba048 100644 (file)
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -183,7 +183,7 @@ EXPORT_SYMBOL(io_remap_page_range);
 #ifndef CONFIG_SMP
 EXPORT_SYMBOL_NOVERS(BTFIXUP_CALL(___xchg32));
 #else
-EXPORT_SYMBOL_NOVERS(BTFIXUP_CALL(__smp_processor_id));
+EXPORT_SYMBOL_NOVERS(BTFIXUP_CALL(__hard_smp_processor_id));
 #endif
 EXPORT_SYMBOL_NOVERS(BTFIXUP_CALL(enable_irq));
 EXPORT_SYMBOL_NOVERS(BTFIXUP_CALL(disable_irq));

diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index f6b713683832b442238ec1a178f0c3fb272ef4ef..f986c0d0922a1c87215fb48456a41132245616a0 100644 (file)
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -53,8 +53,8 @@ void smp_info(struct seq_file *);
 
 BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long)
 BTFIXUPDEF_CALL(void, smp_message_pass, int, int, unsigned long, int)
-BTFIXUPDEF_CALL(int, __smp_processor_id, void)
-BTFIXUPDEF_BLACKBOX(smp_processor_id)
+BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void)
+BTFIXUPDEF_BLACKBOX(hard_smp_processor_id)
 BTFIXUPDEF_BLACKBOX(load_current)
 
 #define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5)
@@ -129,7 +129,7 @@ extern __inline__ int hard_smp_processor_id(void)
                                     "=&r" (cpuid));
           See btfixup.h and btfixupprep.c to understand how a blackbox works.
         */
-       __asm__ __volatile__("sethi %%hi(___b_smp_processor_id), %0\n\t"
+       __asm__ __volatile__("sethi %%hi(___b_hard_smp_processor_id), %0\n\t"
                             "sethi %%hi(boot_cpu_id), %0\n\t"
                             "ldub [%0 + %%lo(boot_cpu_id)], %0\n\t" :
                             "=&r" (cpuid));
@@ -141,7 +141,7 @@ extern __inline__ int hard_smp_processor_id(void)
        int cpuid;
        
        __asm__ __volatile__("mov %%o7, %%g1\n\t"
-                            "call ___f___smp_processor_id\n\t"
+                            "call ___f___hard_smp_processor_id\n\t"
                             " nop\n\t"
                             "mov %%g2, %0\n\t" : "=r"(cpuid) : : "g1", "g2");
        return cpuid;