Commit 80c226fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA
  m68k: Remove big kernel lock in cache flush code
  m68k: __pa(): cast arg to long
  fbdev: atafb - Remove undead ifdef ATAFB_FALCON
  zorro: Fix device_register() error handling
  fbdev/m68k: Fix section mismatches in q40fb.c
  m68k/m68knommu: merge the MMU and non-MMU traps.h
  m68k/m68knommu: merge MMU and non-MMU thread_info.h
  m68k/m68knommu: merge MMU and non-MMU atomic.h
  m68k/m68knommu: clean up page.h
  m68k/m68knommu: merge machdep.h files into a single file
  m68k/m68knommu: merge MMU and non-MMU string.h
  m68k/m68knommu: Remove dead SMP config option
  m68k: move definition of THREAD_SIZE into thread_info_mm.h
  m68k: Use asm-generic/ioctls.h (enables termiox)
  m68k: Remove dead GG2 config option
parents 2c15bd00 779b7e64

arch/m68k/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ config PROC_HARDWARE 


config ISA

	bool

	depends on Q40 || AMIGA_PCMCIA || GG2

	depends on Q40 || AMIGA_PCMCIA

	default y

	help

	  Find out whether you have ISA slots on your motherboard.  ISA is the
@@ -445,7 +445,7 @@ config ISA 


config GENERIC_ISA_DMA

	bool

	depends on Q40 || AMIGA_PCMCIA || GG2

	depends on Q40 || AMIGA_PCMCIA

	default y



config ZONE_DMA

arch/m68k/include/asm/amigahw.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct amiga_hw_present { 
    AMIGAHW_DECLARE(ALICE_NTSC);	/* NTSC Alice (8374) */

    AMIGAHW_DECLARE(MAGIC_REKICK);	/* A3000 Magic Hard Rekick */

    AMIGAHW_DECLARE(PCMCIA);		/* PCMCIA Slot */

    AMIGAHW_DECLARE(GG2_ISA);		/* GG2 Zorro2ISA Bridge */

    AMIGAHW_DECLARE(ZORRO);		/* Zorro AutoConfig */

    AMIGAHW_DECLARE(ZORRO3);		/* Zorro III */

};

arch/m68k/include/asm/atomic.h

+207 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "atomic_no.h"

#ifndef __ARCH_M68K_ATOMIC__

#define __ARCH_M68K_ATOMIC__



#include <linux/types.h>

#include <asm/system.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



/*

 * We do not have SMP m68k systems, so we don't have to deal with that.

 */



#define ATOMIC_INIT(i)	{ (i) }



#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic_set(v, i)	(((v)->counter) = i)



/*

 * The ColdFire parts cannot do some immediate to memory operations,

 * so for them we do not specify the "i" asm constraint.

 */

#ifdef CONFIG_COLDFIRE

#define	ASM_DI	"d"

#else

#include "atomic_mm.h"

#define	ASM_DI	"di"

#endif



static inline void atomic_add(int i, atomic_t *v)

{

	__asm__ __volatile__("addl %1,%0" : "+m" (*v) : ASM_DI (i));

}



static inline void atomic_sub(int i, atomic_t *v)

{

	__asm__ __volatile__("subl %1,%0" : "+m" (*v) : ASM_DI (i));

}



static inline void atomic_inc(atomic_t *v)

{

	__asm__ __volatile__("addql #1,%0" : "+m" (*v));

}



static inline void atomic_dec(atomic_t *v)

{

	__asm__ __volatile__("subql #1,%0" : "+m" (*v));

}



static inline int atomic_dec_and_test(atomic_t *v)

{

	char c;

	__asm__ __volatile__("subql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



static inline int atomic_inc_and_test(atomic_t *v)

{

	char c;

	__asm__ __volatile__("addql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



#ifdef CONFIG_RMW_INSNS



static inline int atomic_add_return(int i, atomic_t *v)

{

	int t, tmp;



	__asm__ __volatile__(

			"1:	movel %2,%1\n"

			"	addl %3,%1\n"

			"	casl %2,%1,%0\n"

			"	jne 1b"

			: "+m" (*v), "=&d" (t), "=&d" (tmp)

			: "g" (i), "2" (atomic_read(v)));

	return t;

}



static inline int atomic_sub_return(int i, atomic_t *v)

{

	int t, tmp;



	__asm__ __volatile__(

			"1:	movel %2,%1\n"

			"	subl %3,%1\n"

			"	casl %2,%1,%0\n"

			"	jne 1b"

			: "+m" (*v), "=&d" (t), "=&d" (tmp)

			: "g" (i), "2" (atomic_read(v)));

	return t;

}



#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



#else /* !CONFIG_RMW_INSNS */



static inline int atomic_add_return(int i, atomic_t * v)

{

	unsigned long flags;

	int t;



	local_irq_save(flags);

	t = atomic_read(v);

	t += i;

	atomic_set(v, t);

	local_irq_restore(flags);



	return t;

}



static inline int atomic_sub_return(int i, atomic_t * v)

{

	unsigned long flags;

	int t;



	local_irq_save(flags);

	t = atomic_read(v);

	t -= i;

	atomic_set(v, t);

	local_irq_restore(flags);



	return t;

}



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	unsigned long flags;

	int prev;



	local_irq_save(flags);

	prev = atomic_read(v);

	if (prev == old)

		atomic_set(v, new);

	local_irq_restore(flags);

	return prev;

}



static inline int atomic_xchg(atomic_t *v, int new)

{

	unsigned long flags;

	int prev;



	local_irq_save(flags);

	prev = atomic_read(v);

	atomic_set(v, new);

	local_irq_restore(flags);

	return prev;

}



#endif /* !CONFIG_RMW_INSNS */



#define atomic_dec_return(v)	atomic_sub_return(1, (v))

#define atomic_inc_return(v)	atomic_add_return(1, (v))



static inline int atomic_sub_and_test(int i, atomic_t *v)

{

	char c;

	__asm__ __volatile__("subl %2,%1; seq %0"

			     : "=d" (c), "+m" (*v)

			     : ASM_DI (i));

	return c != 0;

}



static inline int atomic_add_negative(int i, atomic_t *v)

{

	char c;

	__asm__ __volatile__("addl %2,%1; smi %0"

			     : "=d" (c), "+m" (*v)

			     : "id" (i));

	return c != 0;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("andl %1,%0" : "+m" (*v) : "id" (~(mask)));

}



static inline void atomic_set_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("orl %1,%0" : "+m" (*v) : "id" (mask));

}



static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#include <asm-generic/atomic-long.h>

#include <asm-generic/atomic64.h>

#endif /* __ARCH_M68K_ATOMIC __ */

arch/m68k/include/asm/atomic_mm.h

deleted100644 → 0
+0 −200
Original line number Diff line number Diff line 
#ifndef __ARCH_M68K_ATOMIC__

#define __ARCH_M68K_ATOMIC__



#include <linux/types.h>

#include <asm/system.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



/*

 * We do not have SMP m68k systems, so we don't have to deal with that.

 */



#define ATOMIC_INIT(i)	{ (i) }



#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic_set(v, i)	(((v)->counter) = i)



static inline void atomic_add(int i, atomic_t *v)

{

	__asm__ __volatile__("addl %1,%0" : "+m" (*v) : "id" (i));

}



static inline void atomic_sub(int i, atomic_t *v)

{

	__asm__ __volatile__("subl %1,%0" : "+m" (*v) : "id" (i));

}



static inline void atomic_inc(atomic_t *v)

{

	__asm__ __volatile__("addql #1,%0" : "+m" (*v));

}



static inline void atomic_dec(atomic_t *v)

{

	__asm__ __volatile__("subql #1,%0" : "+m" (*v));

}



static inline int atomic_dec_and_test(atomic_t *v)

{

	char c;

	__asm__ __volatile__("subql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



static inline int atomic_inc_and_test(atomic_t *v)

{

	char c;

	__asm__ __volatile__("addql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



#ifdef CONFIG_RMW_INSNS



static inline int atomic_add_return(int i, atomic_t *v)

{

	int t, tmp;



	__asm__ __volatile__(

			"1:	movel %2,%1\n"

			"	addl %3,%1\n"

			"	casl %2,%1,%0\n"

			"	jne 1b"

			: "+m" (*v), "=&d" (t), "=&d" (tmp)

			: "g" (i), "2" (atomic_read(v)));

	return t;

}



static inline int atomic_sub_return(int i, atomic_t *v)

{

	int t, tmp;



	__asm__ __volatile__(

			"1:	movel %2,%1\n"

			"	subl %3,%1\n"

			"	casl %2,%1,%0\n"

			"	jne 1b"

			: "+m" (*v), "=&d" (t), "=&d" (tmp)

			: "g" (i), "2" (atomic_read(v)));

	return t;

}



#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



#else /* !CONFIG_RMW_INSNS */



static inline int atomic_add_return(int i, atomic_t * v)

{

	unsigned long flags;

	int t;



	local_irq_save(flags);

	t = atomic_read(v);

	t += i;

	atomic_set(v, t);

	local_irq_restore(flags);



	return t;

}



static inline int atomic_sub_return(int i, atomic_t * v)

{

	unsigned long flags;

	int t;



	local_irq_save(flags);

	t = atomic_read(v);

	t -= i;

	atomic_set(v, t);

	local_irq_restore(flags);



	return t;

}



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	unsigned long flags;

	int prev;



	local_irq_save(flags);

	prev = atomic_read(v);

	if (prev == old)

		atomic_set(v, new);

	local_irq_restore(flags);

	return prev;

}



static inline int atomic_xchg(atomic_t *v, int new)

{

	unsigned long flags;

	int prev;



	local_irq_save(flags);

	prev = atomic_read(v);

	atomic_set(v, new);

	local_irq_restore(flags);

	return prev;

}



#endif /* !CONFIG_RMW_INSNS */



#define atomic_dec_return(v)	atomic_sub_return(1, (v))

#define atomic_inc_return(v)	atomic_add_return(1, (v))



static inline int atomic_sub_and_test(int i, atomic_t *v)

{

	char c;

	__asm__ __volatile__("subl %2,%1; seq %0"

			     : "=d" (c), "+m" (*v)

			     : "id" (i));

	return c != 0;

}



static inline int atomic_add_negative(int i, atomic_t *v)

{

	char c;

	__asm__ __volatile__("addl %2,%1; smi %0"

			     : "=d" (c), "+m" (*v)

			     : "id" (i));

	return c != 0;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("andl %1,%0" : "+m" (*v) : "id" (~(mask)));

}



static inline void atomic_set_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("orl %1,%0" : "+m" (*v) : "id" (mask));

}



static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()	barrier()

#define smp_mb__after_atomic_dec()	barrier()

#define smp_mb__before_atomic_inc()	barrier()

#define smp_mb__after_atomic_inc()	barrier()



#include <asm-generic/atomic-long.h>

#endif /* __ARCH_M68K_ATOMIC __ */

arch/m68k/include/asm/atomic_no.h

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
#ifndef __ARCH_M68KNOMMU_ATOMIC__

#define __ARCH_M68KNOMMU_ATOMIC__



#include <linux/types.h>

#include <asm/system.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for

 * resource counting etc..

 */



/*

 * We do not have SMP m68k systems, so we don't have to deal with that.

 */



#define ATOMIC_INIT(i)	{ (i) }



#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic_set(v, i)	(((v)->counter) = i)



static __inline__ void atomic_add(int i, atomic_t *v)

{

#ifdef CONFIG_COLDFIRE

	__asm__ __volatile__("addl %1,%0" : "+m" (*v) : "d" (i));

#else

	__asm__ __volatile__("addl %1,%0" : "+m" (*v) : "di" (i));

#endif

}



static __inline__ void atomic_sub(int i, atomic_t *v)

{

#ifdef CONFIG_COLDFIRE

	__asm__ __volatile__("subl %1,%0" : "+m" (*v) : "d" (i));

#else

	__asm__ __volatile__("subl %1,%0" : "+m" (*v) : "di" (i));

#endif

}



static __inline__ int atomic_sub_and_test(int i, atomic_t * v)

{

	char c;

#ifdef CONFIG_COLDFIRE

	__asm__ __volatile__("subl %2,%1; seq %0"

			     : "=d" (c), "+m" (*v)

			     : "d" (i));

#else

	__asm__ __volatile__("subl %2,%1; seq %0"

			     : "=d" (c), "+m" (*v)

			     : "di" (i));

#endif

	return c != 0;

}



static __inline__ void atomic_inc(volatile atomic_t *v)

{

	__asm__ __volatile__("addql #1,%0" : "+m" (*v));

}



/*

 * atomic_inc_and_test - increment and test

 * @v: pointer of type atomic_t

 *

 * Atomically increments @v by 1

 * and returns true if the result is zero, or false for all

 * other cases.

 */



static __inline__ int atomic_inc_and_test(volatile atomic_t *v)

{

	char c;

	__asm__ __volatile__("addql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



static __inline__ void atomic_dec(volatile atomic_t *v)

{

	__asm__ __volatile__("subql #1,%0" : "+m" (*v));

}



static __inline__ int atomic_dec_and_test(volatile atomic_t *v)

{

	char c;

	__asm__ __volatile__("subql #1,%1; seq %0" : "=d" (c), "+m" (*v));

	return c != 0;

}



static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("andl %1,%0" : "+m" (*v) : "id" (~(mask)));

}



static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)

{

	__asm__ __volatile__("orl %1,%0" : "+m" (*v) : "id" (mask));

}



/* Atomic operations are already serializing */

#define smp_mb__before_atomic_dec()    barrier()

#define smp_mb__after_atomic_dec() barrier()

#define smp_mb__before_atomic_inc()    barrier()

#define smp_mb__after_atomic_inc() barrier()



static inline int atomic_add_return(int i, atomic_t * v)

{

	unsigned long temp, flags;



	local_irq_save(flags);

	temp = *(long *)v;

	temp += i;

	*(long *)v = temp;

	local_irq_restore(flags);



	return temp;

}



#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)



static inline int atomic_sub_return(int i, atomic_t * v)

{

	unsigned long temp, flags;



	local_irq_save(flags);

	temp = *(long *)v;

	temp -= i;

	*(long *)v = temp;

	local_irq_restore(flags);



	return temp;

}



#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_dec_return(v) atomic_sub_return(1,(v))

#define atomic_inc_return(v) atomic_add_return(1,(v))



#include <asm-generic/atomic-long.h>

#endif /* __ARCH_M68KNOMMU_ATOMIC __ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE