diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 20:49:16 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 20:49:16 +0400 |
| commit | f27a15d24670d143f2271a199202d72b6c4fe107 (patch) | |
| tree | cf40deb3dd5d2167e0377bedfa74bdc10fc85218 /arch/avr32/include | |
| parent | 01d5f3b598b18a5035426c30801adf65822dbd0c (diff) | |
| parent | 4c3b7df4ed541f934e7aad7a52aee12d44b9c2ff (diff) | |
| download | linux-f27a15d24670d143f2271a199202d72b6c4fe107.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 updates from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: replace simple_strtoul() with kstrtoul()
arch/avr32/mm/cache.c: export symbol flush_icache_range() for module using
avr32: remove cpu_data macro to fix compiles
Diffstat (limited to 'arch/avr32/include')
| -rw-r--r-- | arch/avr32/include/asm/bugs.h | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/processor.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/avr32/include/asm/bugs.h b/arch/avr32/include/asm/bugs.h index 7635e770622e..278661bbd1b0 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 48d71c5c898a..972adcc1e8f4 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()] -#else -#define cpu_data (&boot_cpu_data) +/* No SMP support so far */ #define current_cpu_data boot_cpu_data -#endif /* This decides where the kernel will search for a free chunk of vm * space during mmap's |