diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /include/asm-arm/proc-armo | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'include/asm-arm/proc-armo')
| -rw-r--r-- | include/asm-arm/proc-armo/elf.h | 3 | ||||
| -rw-r--r-- | include/asm-arm/proc-armo/system.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/proc-armo/elf.h b/include/asm-arm/proc-armo/elf.h index 1fc5e957e..b5901f767 100644 --- a/include/asm-arm/proc-armo/elf.h +++ b/include/asm-arm/proc-armo/elf.h @@ -10,7 +10,6 @@ #define ELF_PROC_OK(x) \ ((x)->e_flags & EF_ARM_APCS26) -#define SET_PERSONALITY(ex,ibcs2) \ - current->personality = PER_LINUX +#define SET_PERSONALITY(ex,ibcs2) set_personality(PER_LINUX) #endif diff --git a/include/asm-arm/proc-armo/system.h b/include/asm-arm/proc-armo/system.h index 1cc3fc606..bc113ae6e 100644 --- a/include/asm-arm/proc-armo/system.h +++ b/include/asm-arm/proc-armo/system.h @@ -9,6 +9,7 @@ extern const char xchg_str[]; +#include <linux/config.h> #include <asm/proc-fns.h> extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int size) @@ -113,7 +114,7 @@ extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int #define local_irq_disable() __cli() #define local_irq_enable() __sti() -#ifdef __SMP__ +#ifdef CONFIG_SMP #error SMP not supported #else |