rpms/kernel/devel linux-2.6-utrace.patch,1.2,1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 12 20:23:02 UTC 2006


Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30849

Modified Files:
	linux-2.6-utrace.patch 
Log Message:
Fix powerpc parallel compile nit

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   39 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 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/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   26 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6838 insertions(+), 3196 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-utrace.patch	12 Jul 2006 07:20:32 -0000	1.2
+++ linux-2.6-utrace.patch	12 Jul 2006 20:23:00 -0000	1.3
@@ -17,11 +17,11 @@
  arch/ia64/kernel/ptrace.c               |   39 -
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
- arch/powerpc/kernel/Makefile            |    2 
+ arch/powerpc/kernel/Makefile            |    4 
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  843 +++++++++---------
+ arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
  arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
@@ -77,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6832 insertions(+), 3191 deletions(-)
+ 79 files changed, 6833 insertions(+), 3191 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -8933,7 +8933,7 @@
  }
 --- linux-2.6/arch/powerpc/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/arch/powerpc/kernel/ptrace.c
-@@ -22,507 +22,526 @@
+@@ -22,507 +22,525 @@
  #include <linux/smp_lock.h>
  #include <linux/errno.h>
  #include <linux/ptrace.h>
@@ -8944,7 +8944,6 @@
  #include <linux/seccomp.h>
  #include <linux/audit.h>
 -#ifdef CONFIG_PPC32
-+#include <linux/compile.h>
 +#include <linux/elf.h>
  #include <linux/module.h>
 -#endif
@@ -9864,7 +9863,7 @@
  
  void do_syscall_trace_enter(struct pt_regs *regs)
  {
-@@ -530,9 +549,8 @@ void do_syscall_trace_enter(struct pt_re
+@@ -530,9 +548,8 @@ void do_syscall_trace_enter(struct pt_re
  	secure_computing(regs->gpr[0]);
  #endif
  
@@ -9876,7 +9875,7 @@
  
  	if (unlikely(current->audit_context))
  		audit_syscall_entry(
-@@ -556,10 +574,13 @@ void do_syscall_trace_leave(struct pt_re
+@@ -556,10 +573,13 @@ void do_syscall_trace_leave(struct pt_re
  		audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
  				   regs->result);
  
@@ -9896,7 +9895,14 @@
  #ifdef CONFIG_PPC32
 --- linux-2.6/arch/powerpc/kernel/Makefile.utrace-ptrace-compat
 +++ linux-2.6/arch/powerpc/kernel/Makefile
-@@ -15,7 +15,7 @@ obj-y				:= semaphore.o cputable.o ptrac
+@@ -10,12 +10,14 @@ CFLAGS_prom_init.o      += -fPIC
+ CFLAGS_btext.o		+= -fPIC
+ endif
+ 
++CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
++
+ obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \
+ 				   irq.o align.o signal_32.o pmc.o vdso.o \
  				   init_task.o process.o systbl.o idle.o
  obj-y				+= vdso32/
  obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \




More information about the fedora-cvs-commits mailing list