diff options
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/include/asm/spinlock.h | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/process.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/spinlock.h b/arch/alpha/include/asm/spinlock.h index aeeb125f6851..e38fb95cb335 100644 --- a/arch/alpha/include/asm/spinlock.h +++ b/arch/alpha/include/asm/spinlock.h | |||
@@ -166,6 +166,9 @@ static inline void __raw_write_unlock(raw_rwlock_t * lock) | |||
166 | lock->lock = 0; | 166 | lock->lock = 0; |
167 | } | 167 | } |
168 | 168 | ||
169 | #define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock) | ||
170 | #define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock) | ||
171 | |||
169 | #define _raw_spin_relax(lock) cpu_relax() | 172 | #define _raw_spin_relax(lock) cpu_relax() |
170 | #define _raw_read_relax(lock) cpu_relax() | 173 | #define _raw_read_relax(lock) cpu_relax() |
171 | #define _raw_write_relax(lock) cpu_relax() | 174 | #define _raw_write_relax(lock) cpu_relax() |
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 8d0097f10208..3a2fb7a02db4 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c | |||
@@ -272,7 +272,7 @@ alpha_vfork(struct pt_regs *regs) | |||
272 | */ | 272 | */ |
273 | 273 | ||
274 | int | 274 | int |
275 | copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | 275 | copy_thread(unsigned long clone_flags, unsigned long usp, |
276 | unsigned long unused, | 276 | unsigned long unused, |
277 | struct task_struct * p, struct pt_regs * regs) | 277 | struct task_struct * p, struct pt_regs * regs) |
278 | { | 278 | { |