s390: fix "cpu_online" redefined warnings
PATCH 1/1 s390: fix "cpu_online" redefined warnings
cpumask-5-10-rewrite-cpumaskh-single-bitmap-based from 2.6.7-rc3-mm1 causes include2/asm/smp.h:54:1: warning: "cpu_online" redefined
Signed-off-by Arnd Bergmann <[email protected]>
===== include/asm-s390/smp.h 1.13 vs edited =====
include/asm-s390/smp.h +0 -6
@@ -31,10 +31,6 @@extern int smp_call_function_on (void (*func) (void *info),void *info,int nonatomic,int wait,int cpu); - -extern cpumask_t cpu_online_map; -extern cpumask_t cpu_possible_map; -#define NO_PROC_ID 0xFF/* No processor magic marker */ /*
@@ -50,8 +46,6 @@#define PROC_CHANGE_PENALTY 20/* Schedule penalty */ #define smp_processor_id () (S390_lowcore.cpu_data.cpu_nr) - -#define cpu_online (cpu) cpu_isset(cpu, cpu_online_map)extern __inline____u16 hard_smp_processor_id (void ) {