rpms/kernel/devel kernel.spec, 1.519, 1.520 linux-2.6-utrace.patch, 1.69, 1.70
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Thu Mar 20 22:02:39 UTC 2008
Author: roland
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3865
Modified Files:
kernel.spec linux-2.6-utrace.patch
Log Message:
utrace rebase
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- kernel.spec 20 Mar 2008 21:52:40 -0000 1.519
+++ kernel.spec 20 Mar 2008 22:01:37 -0000 1.520
@@ -1722,6 +1722,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Thu Mar 20 2008 Roland McGrath <roland at redhat.com>
+- utrace rebase
+
* Thu Mar 20 2008 Dave Jones <davej at redhat.com>
- 2.6.25-rc6-git5
linux-2.6-utrace.patch:
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- linux-2.6-utrace.patch 19 Mar 2008 20:57:06 -0000 1.69
+++ linux-2.6-utrace.patch 20 Mar 2008 22:01:37 -0000 1.70
@@ -1,3 +1,62 @@
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/utrace.tmpl | 23 +
+ Documentation/utrace.txt | 579 +++++++++
+ arch/mips/kernel/irixelf.c | 2 -
+ arch/powerpc/kernel/asm-offsets.c | 4 -
+ arch/powerpc/kernel/process.c | 5 -
+ arch/powerpc/kernel/ptrace.c | 35 +-
+ arch/powerpc/kernel/ptrace32.c | 2 +-
+ arch/powerpc/kernel/signal.c | 8 +-
+ arch/powerpc/kernel/signal_32.c | 19 +-
+ arch/powerpc/kernel/sys_ppc32.c | 5 -
+ arch/sparc64/kernel/binfmt_aout32.c | 2 -
+ arch/x86/ia32/ia32_aout.c | 6 -
+ arch/x86/ia32/ia32_signal.c | 10 -
+ arch/x86/ia32/ia32entry.S | 14 +-
+ arch/x86/ia32/sys_ia32.c | 5 -
+ arch/x86/kernel/entry_64.S | 8 +-
+ arch/x86/kernel/ptrace.c | 157 +--
+ arch/x86/kernel/signal_32.c | 37 +-
+ arch/x86/kernel/signal_64.c | 33 +-
+ arch/x86/kernel/vm86_32.c | 9 +-
+ fs/binfmt_aout.c | 6 -
+ fs/binfmt_elf.c | 6 -
+ fs/binfmt_elf_fdpic.c | 7 -
+ fs/binfmt_flat.c | 3 -
+ fs/binfmt_som.c | 2 -
+ fs/compat.c | 6 +-
+ fs/eventpoll.c | 3 +-
+ fs/exec.c | 12 +-
+ fs/proc/array.c | 9 +-
+ fs/proc/base.c | 43 +-
+ fs/select.c | 4 +-
+ include/asm-alpha/ptrace.h | 1 +
+ include/asm-ia64/ptrace.h | 1 +
+ include/asm-ia64/thread_info.h | 2 +-
+ include/asm-powerpc/ptrace.h | 1 +
+ include/asm-s390/thread_info.h | 2 +-
+ include/asm-sparc64/ptrace.h | 2 +
+ include/asm-x86/ptrace.h | 2 +
+ include/linux/init_task.h | 3 -
+ include/linux/ptrace.h | 71 +-
+ include/linux/sched.h | 22 +-
+ include/linux/thread_info.h | 10 +-
+ include/linux/tracehook.h | 493 ++++++++
+ include/linux/utrace.h | 544 ++++++++
+ init/Kconfig | 29 +
+ kernel/Makefile | 1 +
+ kernel/compat.c | 3 +-
+ kernel/exit.c | 189 +--
+ kernel/fork.c | 70 +-
+ kernel/ptrace.c | 2112 +++++++++++++++++++++++++-------
+ kernel/signal.c | 288 +----
+ kernel/sys_ni.c | 4 +
+ kernel/utrace.c | 2377 +++++++++++++++++++++++++++++++++++
+ mm/nommu.c | 4 +-
+ security/selinux/hooks.c | 59 +-
+ security/selinux/include/objsec.h | 1 -
+ 57 files changed, 6172 insertions(+), 1185 deletions(-)
+
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 300e170..7cf3afc 100644
--- a/Documentation/DocBook/Makefile
@@ -668,10 +727,10 @@
#ifdef CONFIG_SPE
DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 4846bf5..7c8e3da 100644
+index 59311ec..8d506d8 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
-@@ -862,11 +862,6 @@ int sys_execve(unsigned long a0, unsigne
+@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigne
flush_spe_to_thread(current);
error = do_execve(filename, (char __user * __user *) a1,
(char __user * __user *) a2, regs);
@@ -684,7 +743,7 @@
out:
return error;
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index 7673e98..f85d097 100644
+index 2a9fe97..f85d097 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -22,6 +22,7 @@
@@ -695,31 +754,7 @@
#include <linux/elf.h>
#include <linux/user.h>
#include <linux/security.h>
-@@ -530,15 +531,21 @@ static int gpr32_set(struct task_struct
- --count;
- }
-
-- if (kbuf)
-+ if (kbuf) {
- for (; count > 0 && pos <= PT_MAX_PUT_REG; --count)
- regs[pos++] = *k++;
-- else
-+ for (; count > 0 && pos < PT_TRAP; --count, ++pos)
-+ ++k;
-+ } else {
- for (; count > 0 && pos <= PT_MAX_PUT_REG; --count) {
- if (__get_user(reg, u++))
- return -EFAULT;
- regs[pos++] = reg;
- }
-+ for (; count > 0 && pos < PT_TRAP; --count, ++pos)
-+ if (__get_user(reg, u++))
-+ return -EFAULT;
-+ }
-
- if (count > 0 && pos == PT_TRAP) {
- if (kbuf)
-@@ -837,37 +844,18 @@ long arch_ptrace(struct task_struct *chi
+@@ -843,37 +844,18 @@ long arch_ptrace(struct task_struct *chi
break;
default:
@@ -760,7 +795,7 @@
if (unlikely(current->audit_context)) {
#ifdef CONFIG_PPC64
-@@ -889,12 +877,13 @@ void do_syscall_trace_enter(struct pt_re
+@@ -895,12 +877,13 @@ void do_syscall_trace_enter(struct pt_re
void do_syscall_trace_leave(struct pt_regs *regs)
{
@@ -1804,7 +1839,7 @@
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
-index 6da1978..32a39c6 100644
+index 6da1978..3f8826e 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -100,6 +100,8 @@ struct sparc_trapf {
More information about the fedora-extras-commits
mailing list