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

Commit 6a846f3f authored by David Howells's avatar David Howells
Browse files

Disintegrate asm/system.h for C6X 



Disintegrate asm/system.h for C6X.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarMark Salter <msalter@redhat.com>
cc: linux-c6x-dev@linux-c6x.org
parent ae473946

arch/c6x/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm 
generic-y += atomic.h

generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += bug.h

generic-y += bugs.h

generic-y += cputime.h

generic-y += current.h

arch/c6x/include/asm/barrier.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

#ifndef _ASM_C6X_BARRIER_H

#define _ASM_C6X_BARRIER_H



#define nop()                    asm("NOP\n");



#define mb()                     barrier()

#define rmb()                    barrier()

#define wmb()                    barrier()

#define set_mb(var, value)       do { var = value;  mb(); } while (0)

#define set_wmb(var, value)      do { var = value; wmb(); } while (0)



#define smp_mb()	         barrier()

#define smp_rmb()	         barrier()

#define smp_wmb()	         barrier()

#define smp_read_barrier_depends()	do { } while (0)



#endif /* _ASM_C6X_BARRIER_H */

arch/c6x/include/asm/bitops.h

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


#include <linux/bitops.h>



#include <asm/system.h>

#include <asm/byteorder.h>



/*

arch/c6x/include/asm/bug.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

#ifndef _ASM_C6X_BUG_H

#define _ASM_C6X_BUG_H



#include <linux/linkage.h>

#include <asm-generic/bug.h>



struct pt_regs;



extern void die(char *str, struct pt_regs *fp, int nr);

extern asmlinkage int process_exception(struct pt_regs *regs);

extern asmlinkage void enable_exception(void);



#endif /* _ASM_C6X_BUG_H */

arch/c6x/include/asm/cmpxchg.h

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 */

#ifndef _ASM_C6X_CMPXCHG_H

#define _ASM_C6X_CMPXCHG_H



#include <linux/irqflags.h>



/*

 * Misc. functions

 */

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

{

	unsigned int tmp;

	unsigned long flags;



	local_irq_save(flags);



	switch (size) {

	case 1:

		tmp = 0;

		tmp = *((unsigned char *) ptr);

		*((unsigned char *) ptr) = (unsigned char) x;

		break;

	case 2:

		tmp = 0;

		tmp = *((unsigned short *) ptr);

		*((unsigned short *) ptr) = x;

		break;

	case 4:

		tmp = 0;

		tmp = *((unsigned int *) ptr);

		*((unsigned int *) ptr) = x;

		break;

	}

	local_irq_restore(flags);

	return tmp;

}



#define xchg(ptr, x) \

	((__typeof__(*(ptr)))__xchg((unsigned int)(x), (void *) (ptr), \

				    sizeof(*(ptr))))

#define tas(ptr)    xchg((ptr), 1)





#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))



#include <asm-generic/cmpxchg.h>



#endif /* _ASM_C6X_CMPXCHG_H */