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

Commit d550bbd4 authored Mar 28, 2012 by David Howells

Disintegrate asm/system.h for Sparc



Disintegrate asm/system.h for Sparc.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: sparclinux@vger.kernel.org

parent e839ca52

arch/sparc/include/asm/atomic_32.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,9 +13,9 @@

	#include <linux/types.h>		#include <linux/types.h>

			#include <asm/cmpxchg.h>
	#include <asm-generic/atomic64.h>		#include <asm-generic/atomic64.h>

	#include <asm/system.h>

	#define ATOMIC_INIT(i) { (i) }		#define ATOMIC_INIT(i) { (i) }

arch/sparc/include/asm/atomic_64.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	#define __ARCH_SPARC64_ATOMIC__		#define __ARCH_SPARC64_ATOMIC__

	#include <linux/types.h>		#include <linux/types.h>
	#include <asm/system.h>		#include <asm/cmpxchg.h>

	#define ATOMIC_INIT(i) { (i) }		#define ATOMIC_INIT(i) { (i) }
	#define ATOMIC64_INIT(i) { (i) }		#define ATOMIC64_INIT(i) { (i) }
	@@ -85,7 +85,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
	return c;		return c;
	}		}


	#define atomic64_cmpxchg(v, o, n) \		#define atomic64_cmpxchg(v, o, n) \
	((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))		((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
	#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))		#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))

arch/sparc/include/asm/auxio_32.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,6 @@
	#ifndef _SPARC_AUXIO_H		#ifndef _SPARC_AUXIO_H
	#define _SPARC_AUXIO_H		#define _SPARC_AUXIO_H

	#include <asm/system.h>
	#include <asm/vaddrs.h>		#include <asm/vaddrs.h>

	/* This register is an unsigned char in IO space. It does two things.		/* This register is an unsigned char in IO space. It does two things.

arch/sparc/include/asm/barrier.h

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef ___ASM_SPARC_BARRIER_H
			#define ___ASM_SPARC_BARRIER_H
			#if defined(__sparc__) && defined(__arch64__)
			#include <asm/barrier_64.h>
			#else
			#include <asm/barrier_32.h>
			#endif
			#endif

arch/sparc/include/asm/barrier_32.h

0 → 100644

+15 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef __SPARC_BARRIER_H
			#define __SPARC_BARRIER_H

			/* XXX Change this if we ever use a PSO mode kernel. */
			#define mb() __asm__ __volatile__ ("" : : : "memory")
			#define rmb() mb()
			#define wmb() mb()
			#define read_barrier_depends() do { } while(0)
			#define set_mb(__var, __value) do { __var = __value; mb(); } while(0)
			#define smp_mb() __asm__ __volatile__("":::"memory")
			#define smp_rmb() __asm__ __volatile__("":::"memory")
			#define smp_wmb() __asm__ __volatile__("":::"memory")
			#define smp_read_barrier_depends() do { } while(0)

			#endif /* !(__SPARC_BARRIER_H) */