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

Commit a5401ee3 authored by David Howells's avatar David Howells
Browse files

Disintegrate asm/system.h for H8300 



Disintegrate asm/system.h for H8300.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Yoshinori Sato <ysato@users.sourceforge.jp>
parent 40ab3317

arch/h8300/include/asm/atomic.h

+1 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ARCH_H8300_ATOMIC__



#include <linux/types.h>

#include <asm/cmpxchg.h>



/*

 * Atomic operations that C can't guarantee us.  Useful for
@@ -13,7 +14,6 @@ 
#define atomic_read(v)		(*(volatile int *)&(v)->counter)

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



#include <asm/system.h>

#include <linux/kernel.h>



static __inline__ int atomic_add_return(int i, atomic_t *v)
@@ -102,8 +102,6 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) 
	return ret;

}



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



static inline int __atomic_add_unless(atomic_t *v, int a, int u)

{

	int ret;

arch/h8300/include/asm/barrier.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef _H8300_BARRIER_H

#define _H8300_BARRIER_H



#define nop()  asm volatile ("nop"::)



/*

 * Force strict CPU ordering.

 * Not really required on H8...

 */

#define mb()   asm volatile (""   : : :"memory")

#define rmb()  asm volatile (""   : : :"memory")

#define wmb()  asm volatile (""   : : :"memory")

#define set_mb(var, value) do { xchg(&var, value); } while (0)



#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



#endif /* _H8300_BARRIER_H */

arch/h8300/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 */



#include <linux/compiler.h>

#include <asm/system.h>



#ifdef __KERNEL__

arch/h8300/include/asm/bug.h

+4 −0
Original line number Diff line number Diff line
@@ -5,4 +5,8 @@ 
#define is_valid_bugaddr(addr) (1)



#include <asm-generic/bug.h>



struct pt_regs;

extern void die(const char *str, struct pt_regs *fp, unsigned long err);



#endif

arch/h8300/include/asm/cmpxchg.h

0 → 100644
+60 −0
Original line number Diff line number Diff line 
#ifndef __ARCH_H8300_CMPXCHG__

#define __ARCH_H8300_CMPXCHG__



#include <linux/irqflags.h>



#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))



struct __xchg_dummy { unsigned long a[100]; };

#define __xg(x) ((volatile struct __xchg_dummy *)(x))



static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)

{

  unsigned long tmp, flags;



  local_irq_save(flags);



  switch (size) {

  case 1:

    __asm__ __volatile__

    ("mov.b %2,%0\n\t"

     "mov.b %1,%2"

    : "=&r" (tmp) : "r" (x), "m" (*__xg(ptr)) : "memory");

    break;

  case 2:

    __asm__ __volatile__

    ("mov.w %2,%0\n\t"

     "mov.w %1,%2"

    : "=&r" (tmp) : "r" (x), "m" (*__xg(ptr)) : "memory");

    break;

  case 4:

    __asm__ __volatile__

    ("mov.l %2,%0\n\t"

     "mov.l %1,%2"

    : "=&r" (tmp) : "r" (x), "m" (*__xg(ptr)) : "memory");

    break;

  default:

    tmp = 0;	  

  }

  local_irq_restore(flags);

  return tmp;

}



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



/*

 * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make

 * them available.

 */

#define cmpxchg_local(ptr, o, n)				  	       \

	((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\

			(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 atomic_xchg(v, new) (xchg(&((v)->counter), new))



#endif /* __ARCH_H8300_CMPXCHG__ */