git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
83f06d6
..
2f8cdbe
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-1025,7
+1025,7
@@
asmlinkage long do_getxpid(long *ppid)
*ppid = sys_getppid();
return sys_getpid();
}
-
+
#else /* _alpha_ */
asmlinkage long sys_getuid(void)