diff options
| author | David Howells <dhowells@redhat.com> | 2012-03-28 21:30:02 +0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-03-28 21:30:02 +0400 |
| commit | b1a154dbf9ddbf396578642299ce75aa73d01763 (patch) | |
| tree | 2db04ef58f3af63ed2ca6060a7bc18157acc8a7d /arch/cris/include/arch-v32 | |
| parent | 6a846f3f821a252762897751fa0aeb68dda635f5 (diff) | |
| download | linux-b1a154dbf9ddbf396578642299ce75aa73d01763.tar.xz | |
Disintegrate asm/system.h for CRIS
Disintegrate asm/system.h for CRIS.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
cc: linux-cris-kernel@axis.com
Diffstat (limited to 'arch/cris/include/arch-v32')
| -rw-r--r-- | arch/cris/include/arch-v32/arch/elf.h | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/system.h | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/cris/include/arch-v32/arch/elf.h b/arch/cris/include/arch-v32/arch/elf.h index 1324e505a4d8..c46d58291166 100644 --- a/arch/cris/include/arch-v32/arch/elf.h +++ b/arch/cris/include/arch-v32/arch/elf.h @@ -1,6 +1,8 @@ #ifndef _ASM_CRIS_ELF_H #define _ASM_CRIS_ELF_H +#include <arch/system.h> + #define ELF_CORE_EFLAGS EF_CRIS_VARIANT_V32 /* diff --git a/arch/cris/include/arch-v32/arch/system.h b/arch/cris/include/arch-v32/arch/system.h index 76cea99eaa60..db853fb3a458 100644 --- a/arch/cris/include/arch-v32/arch/system.h +++ b/arch/cris/include/arch-v32/arch/system.h @@ -34,14 +34,4 @@ static inline unsigned long rdsp(void) /* Write the user-mode stack pointer. */ #define wrusp(usp) __asm__ __volatile__ ("move %0, $usp" : : "rm" (usp)) -#define nop() __asm__ __volatile__ ("nop"); - -#define xchg(ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long) (x),(ptr),sizeof(*(ptr)))) - -#define tas(ptr) (xchg((ptr),1)) - -struct __xchg_dummy { unsigned long a[100]; }; -#define __xg(x) ((struct __xchg_dummy *)(x)) - #endif /* _ASM_CRIS_ARCH_SYSTEM_H */ |