git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'kumar/kumar-next' into next
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
signal.c
diff --git
a/arch/ia64/kernel/signal.c
b/arch/ia64/kernel/signal.c
index e12500a9c44390b025feeb0b670baac1c1ffd523..e1821ca4c7dfddea3827102e2bd63a016e1162f3 100644
(file)
--- a/
arch/ia64/kernel/signal.c
+++ b/
arch/ia64/kernel/signal.c
@@
-229,7
+229,7
@@
ia64_rt_sigreturn (struct sigscratch *scr)
si.si_errno = 0;
si.si_code = SI_KERNEL;
si.si_pid = task_pid_vnr(current);
si.si_errno = 0;
si.si_code = SI_KERNEL;
si.si_pid = task_pid_vnr(current);
- si.si_uid = current
->uid
;
+ si.si_uid = current
_uid()
;
si.si_addr = sc;
force_sig_info(SIGSEGV, &si, current);
return retval;
si.si_addr = sc;
force_sig_info(SIGSEGV, &si, current);
return retval;
@@
-326,7
+326,7
@@
force_sigsegv_info (int sig, void __user *addr)
si.si_errno = 0;
si.si_code = SI_KERNEL;
si.si_pid = task_pid_vnr(current);
si.si_errno = 0;
si.si_code = SI_KERNEL;
si.si_pid = task_pid_vnr(current);
- si.si_uid = current
->uid
;
+ si.si_uid = current
_uid()
;
si.si_addr = addr;
force_sig_info(SIGSEGV, &si, current);
return 0;
si.si_addr = addr;
force_sig_info(SIGSEGV, &si, current);
return 0;