diff options
| author | Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> | 2010-08-04 14:41:45 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-22 09:43:23 +0200 |
| commit | 5bc5a70b62e5b672e40dd031da3e0444f62dbd3a (patch) | |
| tree | 6b2ae103d66809506f94f4f2aced8065ff74036e | |
| parent | a8a6aa0f060e98f9af170c0905d3d5af3b3fa21d (diff) | |
| download | linux-stable-5bc5a70b62e5b672e40dd031da3e0444f62dbd3a.tar.gz linux-stable-5bc5a70b62e5b672e40dd031da3e0444f62dbd3a.tar.bz2 linux-stable-5bc5a70b62e5b672e40dd031da3e0444f62dbd3a.zip | |
m68k/m68knommu: Remove dead SMP config option
CONFIG_SMP doesn't exist in Kconfig (for this architecure), therefore
remove all references to it from the source.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/include/asm/system_mm.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/system_no.h | 9 | ||||
| -rw-r--r-- | arch/m68k/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/m68k/sun3/sun3ints.c | 2 | ||||
| -rw-r--r-- | arch/m68knommu/kernel/time.c | 3 |
5 files changed, 1 insertions, 17 deletions
diff --git a/arch/m68k/include/asm/system_mm.h b/arch/m68k/include/asm/system_mm.h index dbb6515ffd5b..485daecb350b 100644 --- a/arch/m68k/include/asm/system_mm.h +++ b/arch/m68k/include/asm/system_mm.h @@ -205,9 +205,7 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ (unsigned long)(n), sizeof(*(ptr)))) -#ifndef CONFIG_SMP #include <asm-generic/cmpxchg.h> -#endif #endif diff --git a/arch/m68k/include/asm/system_no.h b/arch/m68k/include/asm/system_no.h index 3c0718d74398..08f31bdba36d 100644 --- a/arch/m68k/include/asm/system_no.h +++ b/arch/m68k/include/asm/system_no.h @@ -106,17 +106,10 @@ asmlinkage void resume(void); #define wmb() asm volatile ("" : : :"memory") #define set_mb(var, value) ({ (var) = (value); wmb(); }) -#ifdef CONFIG_SMP -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() -#define smp_read_barrier_depends() read_barrier_depends() -#else #define smp_mb() barrier() #define smp_rmb() barrier() #define smp_wmb() barrier() #define smp_read_barrier_depends() do { } while(0) -#endif #define read_barrier_depends() ((void)0) @@ -199,9 +192,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz (unsigned long)(n), sizeof(*(ptr)))) #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) -#ifndef CONFIG_SMP #include <asm-generic/cmpxchg.h> -#endif #define arch_align_stack(x) (x) diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 4926b3856c15..06438dac08ff 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -42,9 +42,7 @@ static inline int set_rtc_mmss(unsigned long nowtime) static irqreturn_t timer_interrupt(int irq, void *dummy) { do_timer(1); -#ifndef CONFIG_SMP update_process_times(user_mode(get_irq_regs())); -#endif profile_tick(CPU_PROFILING); #ifdef CONFIG_HEARTBEAT diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c index ad90393a3361..2d9e21bd313a 100644 --- a/arch/m68k/sun3/sun3ints.c +++ b/arch/m68k/sun3/sun3ints.c @@ -67,9 +67,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id) intersil_clear(); #endif do_timer(1); -#ifndef CONFIG_SMP update_process_times(user_mode(get_irq_regs())); -#endif if (!(kstat_cpu(0).irqs[irq] % 20)) sun3_leds(led_pattern[(kstat_cpu(0).irqs[irq] % 160) / 20]); return IRQ_HANDLED; diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index a90acf5b0cde..7089dd9d843b 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c @@ -50,9 +50,8 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy) write_sequnlock(&xtime_lock); -#ifndef CONFIG_SMP update_process_times(user_mode(get_irq_regs())); -#endif + return(IRQ_HANDLED); } #endif |