Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / include / asm-s390 / smp.h

diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index 9473786387a349123cafb4cd43221bf884ccd089..a2ae7628bbaaf8e0c0d06a9fab16863aac607777 100644 (file)
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -47,12 +47,12 @@ extern int smp_call_function_on(void (*func) (void *info), void *info,
  
 #define PROC_CHANGE_PENALTY    20              /* Schedule penalty */
 
-#define smp_processor_id() (S390_lowcore.cpu_data.cpu_nr)
+#define raw_smp_processor_id() (S390_lowcore.cpu_data.cpu_nr)
 
 extern int smp_get_cpu(cpumask_t cpu_map);
 extern void smp_put_cpu(int cpu);
 
-extern __inline__ __u16 hard_smp_processor_id(void)
+static inline __u16 hard_smp_processor_id(void)
 {
         __u16 cpu_address;