Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bc5a70b authored by Christian Dietrich's avatar Christian Dietrich Committed by Geert Uytterhoeven
Browse files

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: default avatarChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent a8a6aa0f

arch/m68k/include/asm/system_mm.h

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/m68k/include/asm/system_no.h

+0 −9
Original line number Diff line number Diff line
@@ -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)

arch/m68k/kernel/time.c

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/m68k/sun3/sun3ints.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

arch/m68knommu/kernel/time.c

+1 −2
Original line number Diff line number Diff line
@@ -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