path: root/arch/avr32
diff options
authorWolfram Sang <wsa@the-dreams.de>2014-02-22 09:28:27 +0100
committerHans-Christian Egtvedt <egtvedt@samfundet.no>2014-03-31 08:41:36 +0200
commit8acc8722d3b5755abbfbe73f732dec576f28757a (patch)
treee491dd49075931b7f8fc294004115eca8e12ed14 /arch/avr32
parent455c6fdbd219161bd09b1165f11699d6d73de11c (diff)
avr32: remove cpu_data macro to fix compiles
Having cpu_data as a parameterless macro can easily cause build failures because it can be a variable name like in linux/pm_domain.h [1]. So, remove the macro and convert its only user. Because this architecture cannot do SMP, remove the whole SMP block, too. Only compile tested due to no hardware. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no> [1] https://lists.01.org/pipermail/kbuild-all/2014-February/003252.html
Diffstat (limited to 'arch/avr32')
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/avr32/include/asm/bugs.h b/arch/avr32/include/asm/bugs.h
index 7635e770622..278661bbd1b 100644
--- a/arch/avr32/include/asm/bugs.h
+++ b/arch/avr32/include/asm/bugs.h
@@ -9,7 +9,7 @@
static void __init check_bugs(void)
- cpu_data->loops_per_jiffy = loops_per_jiffy;
+ boot_cpu_data.loops_per_jiffy = loops_per_jiffy;
#endif /* __ASM_AVR32_BUGS_H */
diff --git a/arch/avr32/include/asm/processor.h b/arch/avr32/include/asm/processor.h
index 48d71c5c898..972adcc1e8f 100644
--- a/arch/avr32/include/asm/processor.h
+++ b/arch/avr32/include/asm/processor.h
@@ -83,13 +83,8 @@ static inline unsigned int avr32_get_chip_revision(struct avr32_cpuinfo *cpu)
extern struct avr32_cpuinfo boot_cpu_data;
-#ifdef CONFIG_SMP
-extern struct avr32_cpuinfo cpu_data[];
-#define current_cpu_data cpu_data[smp_processor_id()]
-#define cpu_data (&boot_cpu_data)
+/* No SMP support so far */
#define current_cpu_data boot_cpu_data
/* This decides where the kernel will search for a free chunk of vm
* space during mmap's