diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /arch/arm | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/signal.c | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/sys_arm.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index f9fbd2536..54d962790 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -18,7 +18,6 @@ #include <linux/stddef.h> #include <linux/binfmts.h> #include <linux/tty.h> -#include <linux/highuid.h> #include <asm/ucontext.h> #include <asm/uaccess.h> @@ -502,7 +501,6 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) info.si_code = SI_USER; info.si_pid = current->p_pptr->pid; info.si_uid = current->p_pptr->uid; - info.si_uid16 = high2lowuid(current->p_pptr->uid); } /* If the (new) signal is now blocked, requeue it. */ diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index 5e989663b..47b2930c2 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c @@ -286,9 +286,9 @@ asmlinkage int sys_uname(struct old_utsname * name) if(!name) return -EFAULT; - down(&uts_sem); + down_read(&uts_sem); err=copy_to_user (name, &system_utsname, sizeof (*name)); - up(&uts_sem); + up_read(&uts_sem); return err?-EFAULT:0; } @@ -309,7 +309,7 @@ asmlinkage int sys_olduname(struct oldold_utsname * name) if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) return -EFAULT; - down(&uts_sem); + down_read(&uts_sem); error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN); error |= __put_user(0,name->sysname+__OLD_UTS_LEN); @@ -322,7 +322,7 @@ asmlinkage int sys_olduname(struct oldold_utsname * name) error |= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN); error |= __put_user(0,name->machine+__OLD_UTS_LEN); - up(&uts_sem); + up_read(&uts_sem); error = error ? -EFAULT : 0; |