rpms/kernel/devel kernel.spec, 1.346, 1.347 linux-2.6-utrace-core.patch, 1.12, 1.13 linux-2.6-utrace-ptrace-compat.patch, 1.11, 1.12 linux-2.6-utrace-regset-avr32.patch, 1.4, 1.5 linux-2.6-utrace-regset-ia64.patch, 1.4, 1.5 linux-2.6-utrace-regset.patch, 1.9, 1.10 linux-2.6-utrace-tracehook-avr32.patch, 1.4, 1.5 linux-2.6-utrace-tracehook-ia64.patch, 1.4, 1.5 linux-2.6-utrace-tracehook.patch, 1.19, 1.20

Roland McGrath (roland) fedora-extras-commits at redhat.com
Mon Jan 7 01:18:10 UTC 2008


Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29951

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset-avr32.patch 
	linux-2.6-utrace-regset-ia64.patch 
	linux-2.6-utrace-regset.patch 
	linux-2.6-utrace-tracehook-avr32.patch 
	linux-2.6-utrace-tracehook-ia64.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
Reenable utrace after pulling current patches that already applied fine.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- kernel.spec	6 Jan 2008 22:54:08 -0000	1.346
+++ kernel.spec	7 Jan 2008 01:17:07 -0000	1.347
@@ -968,29 +968,29 @@
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
-#ApplyPatch linux-2.6-utrace-tracehook.patch
+ApplyPatch linux-2.6-utrace-tracehook.patch
 # Additional arch work by other contributors.
-#ApplyPatch linux-2.6-utrace-tracehook-ia64.patch
-#ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch
-#ApplyPatch linux-2.6-utrace-tracehook-s390.patch
-#ApplyPatch linux-2.6-utrace-tracehook-um.patch
-#ApplyPatch linux-2.6-utrace-tracehook-avr32.patch
+ApplyPatch linux-2.6-utrace-tracehook-ia64.patch
+ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch
+ApplyPatch linux-2.6-utrace-tracehook-s390.patch
+ApplyPatch linux-2.6-utrace-tracehook-um.patch
+ApplyPatch linux-2.6-utrace-tracehook-avr32.patch
 # Main patch includes i386, x86_64, powerpc.
-#ApplyPatch linux-2.6-utrace-regset.patch
+ApplyPatch linux-2.6-utrace-regset.patch
 # Additional arch work by other contributors.
-#ApplyPatch linux-2.6-utrace-regset-ia64.patch
-#ApplyPatch linux-2.6-utrace-regset-sparc64.patch
-#ApplyPatch linux-2.6-utrace-regset-s390.patch
-#ApplyPatch linux-2.6-utrace-regset-avr32.patch
+ApplyPatch linux-2.6-utrace-regset-ia64.patch
+ApplyPatch linux-2.6-utrace-regset-sparc64.patch
+ApplyPatch linux-2.6-utrace-regset-s390.patch
+ApplyPatch linux-2.6-utrace-regset-avr32.patch
 # Core patch has no machine dependencies.
-#ApplyPatch linux-2.6-utrace-core.patch
+ApplyPatch linux-2.6-utrace-core.patch
 # Main patch includes i386, x86_64, powerpc.
-#ApplyPatch linux-2.6-utrace-ptrace-compat.patch
+ApplyPatch linux-2.6-utrace-ptrace-compat.patch
 # Additional arch work by other contributors.
-#ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch
-#ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
-#ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
-#ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
+ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch
+ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
+ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
+ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1735,6 +1735,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Sun Jan  6 2008 Roland McGrath <roland at redhat.com>
+- Reenable utrace after pulling current patches that already applied fine.
+
 * Sun Jan 6 2008 Kyle McMartin <kmcmartin at redhat.com>
 - 2.6.24-rc7
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-utrace-core.patch	9 Dec 2007 02:01:29 -0000	1.12
+++ linux-2.6-utrace-core.patch	7 Jan 2008 01:17:07 -0000	1.13
@@ -3865,7 +3865,7 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -756,3 +756,21 @@ source "block/Kconfig"
+@@ -762,3 +762,21 @@ source "block/Kconfig"
  
  config PREEMPT_NOTIFIERS
  	bool

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-utrace-ptrace-compat.patch	9 Dec 2007 02:01:29 -0000	1.11
+++ linux-2.6-utrace-ptrace-compat.patch	7 Jan 2008 01:17:07 -0000	1.12
@@ -28,10 +28,10 @@
  kernel/sys_ni.c                 |    4 
  kernel/Makefile                 |    3 
  include/linux/sched.h           |    4 
- include/linux/ptrace.h          |  221 +++-
- include/asm-x86/ptrace-abi.h    |    3 
+ include/linux/ptrace.h          |  222 +++-
+ include/asm-x86/ptrace-abi.h    |    6 
  init/Kconfig                    |   15 
- 19 files changed, 2650 insertions(+), 788 deletions(-)
+ 19 files changed, 2650 insertions(+), 792 deletions(-)
  delete arch/powerpc/kernel/ptrace32.c
 
 --- linux-2.6/fs/proc/base.c
@@ -1114,7 +1114,7 @@
  static int
  ia32_genregs_get(struct task_struct *target,
  		 const struct utrace_regset *regset,
-@@ -604,3 +599,55 @@ const struct utrace_regset_view utrace_i
+@@ -603,3 +598,55 @@ const struct utrace_regset_view utrace_i
  	.name = "i386", .e_machine = EM_386,
  	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
  };
@@ -1183,7 +1183,7 @@
  	.quad sys_pause
 --- linux-2.6/arch/x86/kernel/ptrace_64.c
 +++ linux-2.6/arch/x86/kernel/ptrace_64.c
-@@ -721,6 +721,52 @@ const struct utrace_regset_view *utrace_
+@@ -720,6 +720,52 @@ const struct utrace_regset_view *utrace_
  }
  
  
@@ -1426,7 +1426,7 @@
 +	task_unlock(state->parent);
  }
  
--static int may_attach(struct task_struct *task)
+-int __ptrace_may_attach(struct task_struct *task)
 +static struct ptrace_state *
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
@@ -1463,7 +1463,7 @@
 -{
 -	int err;
 -	task_lock(task);
--	err = may_attach(task);
+-	err = __ptrace_may_attach(task);
 -	task_unlock(task);
 -	return !err;
 +	struct ptrace_state *state;
@@ -1702,7 +1702,7 @@
 +		goto bad;
  	if (same_thread_group(task, current))
  		goto bad;
--	retval = may_attach(task);
+-	retval = __ptrace_may_attach(task);
 -	if (retval)
 +	if (!task->mm)		/* kernel threads */
 +		goto bad;
@@ -3537,7 +3537,7 @@
  	 */
 --- linux-2.6/include/linux/ptrace.h
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,49 +49,196 @@
+@@ -49,49 +49,195 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
@@ -3587,7 +3587,8 @@
 -extern int ptrace_check_attach(struct task_struct *task, int kill);
 -extern int ptrace_request(struct task_struct *child, long request, long addr, long data);
  extern int ptrace_may_attach(struct task_struct *task);
- 
+-extern int __ptrace_may_attach(struct task_struct *task);
++
 +
 +#ifdef CONFIG_PTRACE
 +#include <asm/tracehook.h>
@@ -3685,7 +3686,7 @@
 +				    (unsigned long __user *)data, NULL, 0);
 +}
 +
-+/* Convenience wrapper for the common PTRACE_PEEKUSR implementation.  */
++/* Convenience wrapper for the common PTRACE_POKEUSR implementation.  */
 +static inline int ptrace_pokeusr(struct task_struct *child,
 +				 struct utrace_attached_engine *engine,
 +				 const struct ptrace_layout_segment layout[],
@@ -3767,14 +3768,18 @@
 +	return -ECHILD;
 +}
 +#endif	/* CONFIG_PTRACE */
-+
+ 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
- 
 --- linux-2.6/include/asm-x86/ptrace-abi.h
 +++ linux-2.6/include/asm-x86/ptrace-abi.h
-@@ -78,4 +78,7 @@
- # define PTRACE_SYSEMU_SINGLESTEP 32
+@@ -73,9 +73,9 @@
+ 
+ #ifdef __x86_64__
+ # define PTRACE_ARCH_PRCTL	  30
+-#else
+-# define PTRACE_SYSEMU		  31
+-# define PTRACE_SYSEMU_SINGLESTEP 32
  #endif
  
 +#define PTRACE_SYSEMU		  31
@@ -3783,7 +3788,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -759,10 +759,21 @@ config PREEMPT_NOTIFIERS
+@@ -765,10 +765,21 @@ config PREEMPT_NOTIFIERS
  
  menu "Process debugging support"
  

linux-2.6-utrace-regset-avr32.patch:

Index: linux-2.6-utrace-regset-avr32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-avr32.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset-avr32.patch	9 Dec 2007 02:01:29 -0000	1.4
+++ linux-2.6-utrace-regset-avr32.patch	7 Jan 2008 01:17:07 -0000	1.5
@@ -10,8 +10,8 @@
 
 ---
 
- arch/avr32/kernel/ptrace.c |  118 ++++++++++++++++----------------------------
- 1 files changed, 44 insertions(+), 74 deletions(-)
+ arch/avr32/kernel/ptrace.c |  111 +++++++++++++++++---------------------------
+ 1 files changed, 44 insertions(+), 67 deletions(-)
 
 --- linux-2.6/arch/avr32/kernel/ptrace.c
 +++ linux-2.6/arch/avr32/kernel/ptrace.c
@@ -157,19 +157,3 @@
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
  	int ret;
-@@ -233,15 +210,8 @@ asmlinkage void syscall_trace(struct pt_
- 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
- 		return;
- 
--<<<<<<< HEAD:arch/avr32/kernel/ptrace.c
- 	tracehook_report_syscall(regs, is_exit);
- }
--=======
--	/* The 0x80 provides a way for the tracing parent to
--	 * distinguish between a syscall stop and SIGTRAP delivery */
--	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
--				 ? 0x80 : 0));
-->>>>>>> 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814:arch/avr32/kernel/ptrace.c
- 
- /*
-  * Handle hitting a breakpoint

linux-2.6-utrace-regset-ia64.patch:

Index: linux-2.6-utrace-regset-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-ia64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-regset-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
+++ linux-2.6-utrace-regset-ia64.patch	7 Jan 2008 01:17:07 -0000	1.5
@@ -194,7 +194,7 @@
 +		end = (dst->pos - 7 * sizeof(int)) / sizeof(struct _fpreg_ia32);
 +		for (; start < end; start++)
 +			access_fpreg_ia32(start, (struct _fpreg_ia32 *)buf + start,
-+					pt, info->sw, tos, 0);
++					pt, info->sw, tos, 1);
 +		if (dst->count == 0)
 +			return;
 +	}

linux-2.6-utrace-regset.patch:

Index: linux-2.6-utrace-regset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace-regset.patch	12 Nov 2007 08:19:34 -0000	1.9
+++ linux-2.6-utrace-regset.patch	7 Jan 2008 01:17:07 -0000	1.10
@@ -14,17 +14,17 @@
  arch/powerpc/kernel/Makefile   |    2 
  arch/powerpc/kernel/ptrace32.c |   20 -
  arch/powerpc/kernel/ptrace.c   |  644 ++++++++++++++++++++++----------
- arch/x86/ia32/ptrace32.c       |  722 +++++++++++++++++++++++-------------
+ arch/x86/ia32/ptrace32.c       |  721 +++++++++++++++++++++++-------------
  arch/x86/ia32/fpu32.c          |   92 ++++-
  arch/x86/kernel/ptrace_32.c    |  806 +++++++++++++++++++++++-----------------
  arch/x86/kernel/i387_32.c      |  143 ++++---
- arch/x86/kernel/ptrace_64.c    |  721 ++++++++++++++++++++++--------------
+ arch/x86/kernel/ptrace_64.c    |  720 ++++++++++++++++++++++--------------
  kernel/ptrace.c                |    9 
  include/linux/tracehook.h      |  255 ++++++++++++-
  include/asm-x86/fpu32.h        |    3 
  include/asm-x86/i387_32.h      |   13 -
  include/asm-x86/tracehook.h    |    8 
- 13 files changed, 2230 insertions(+), 1208 deletions(-)
+ 13 files changed, 2228 insertions(+), 1208 deletions(-)
 
 --- linux-2.6/arch/powerpc/kernel/Makefile
 +++ linux-2.6/arch/powerpc/kernel/Makefile
@@ -1006,7 +1006,7 @@
 +	case offsetof(struct user_regs_struct32, es):
 +		child->thread.es = val &= 0xffff;
 +		if (child == current)
-+			loadsegment(ds, val);
++			loadsegment(es, val);
  		break;
 -	case offsetof(struct user32, regs.ss): 
 +	case offsetof(struct user_regs_struct32, ss):
@@ -1126,7 +1126,7 @@
  		break;
  
  	R32(cs, cs);
-@@ -168,239 +148,459 @@ static int getreg32(struct task_struct *
+@@ -168,239 +148,458 @@ static int getreg32(struct task_struct *
  	R32(eax, rax);
  	R32(orig_eax, orig_rax);
  	R32(eip, rip);
@@ -1223,7 +1223,6 @@
 +		}
 +	}
 +	else {
-+		int ret = 0;
 +		const u32 __user *up = ubuf;
 +		while (!ret && count > 0) {
 +			u32 val;
@@ -3176,7 +3175,7 @@
  	}
  	put_stack_long(child, regno - sizeof(struct pt_regs), value);
  	return 0;
-@@ -286,282 +299,428 @@ static int putreg(struct task_struct *ch
+@@ -286,282 +299,427 @@ static int putreg(struct task_struct *ch
  static unsigned long getreg(struct task_struct *child, unsigned long regno)
  {
  	unsigned long val;
@@ -3288,7 +3287,6 @@
 +		}
 +	}
 +	else {
-+		int ret = 0;
 +		const unsigned long __user *up = ubuf;
 +		while (!ret && count > 0) {
 +			unsigned long val;

linux-2.6-utrace-tracehook-avr32.patch:

Index: linux-2.6-utrace-tracehook-avr32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-avr32.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-tracehook-avr32.patch	9 Dec 2007 02:01:29 -0000	1.4
+++ linux-2.6-utrace-tracehook-avr32.patch	7 Jan 2008 01:17:07 -0000	1.5
@@ -9,11 +9,11 @@
 
 ---
 
- arch/avr32/kernel/ptrace.c       |   49 +++++++++++++++++-------------
+ arch/avr32/kernel/ptrace.c       |   50 +++++++++++++++----------------
  arch/avr32/kernel/process.c      |    2 -
  arch/avr32/kernel/entry-avr32b.S |   10 +++++-
  include/asm-avr32/tracehook.h    |   62 ++++++++++++++++++++++++++++++++++++++
- 4 files changed, 97 insertions(+), 26 deletions(-)
+ 4 files changed, 94 insertions(+), 30 deletions(-)
  create include/asm-avr32/tracehook.h
 
 --- linux-2.6/arch/avr32/kernel/ptrace.c
@@ -51,7 +51,7 @@
  static void ptrace_single_step(struct task_struct *tsk)
  {
  	pr_debug("ptrace_single_step: pid=%u, PC=0x%08lx, SR=0x%08lx\n",
-@@ -229,30 +226,38 @@ long arch_ptrace(struct task_struct *chi
+@@ -229,30 +226,31 @@ long arch_ptrace(struct task_struct *chi
  
  	return ret;
  }
@@ -65,15 +65,12 @@
 -	if (!(current->ptrace & PT_PTRACED))
 -		return;
  
-+<<<<<<< HEAD:arch/avr32/kernel/ptrace.c
+-	/* The 0x80 provides a way for the tracing parent to
+-	 * distinguish between a syscall stop and SIGTRAP delivery */
+-	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+-				 ? 0x80 : 0));
 +	tracehook_report_syscall(regs, is_exit);
 +}
-+=======
- 	/* The 0x80 provides a way for the tracing parent to
- 	 * distinguish between a syscall stop and SIGTRAP delivery */
- 	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
- 				 ? 0x80 : 0));
-+>>>>>>> 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814:arch/avr32/kernel/ptrace.c
  
 -	/*
 -	 * this isn't the same as continuing with a signal, but it

linux-2.6-utrace-tracehook-ia64.patch:

Index: linux-2.6-utrace-tracehook-ia64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-ia64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-tracehook-ia64.patch	11 Sep 2007 18:03:55 -0000	1.4
+++ linux-2.6-utrace-tracehook-ia64.patch	7 Jan 2008 01:17:07 -0000	1.5
@@ -161,7 +161,7 @@
  #include <linux/sched.h>
  #include <linux/signal.h>
  #include <linux/smp.h>
-@@ -429,6 +429,8 @@ handle_signal (unsigned long sig, struct
+@@ -421,6 +421,8 @@ handle_signal (unsigned long sig, struct
  		sigaddset(&current->blocked, sig);
  	recalc_sigpending();
  	spin_unlock_irq(&current->sighand->siglock);

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-utrace-tracehook.patch	9 Dec 2007 02:01:29 -0000	1.19
+++ linux-2.6-utrace-tracehook.patch	7 Jan 2008 01:17:07 -0000	1.20
@@ -148,10 +148,10 @@
 -	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
 -	 security_ptrace(current,task) == 0))
 -
- static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+ struct mm_struct *mm_for_maps(struct task_struct *task)
  {
- 	int res = 0;
-@@ -589,7 +583,8 @@ static ssize_t mem_read(struct file * fi
+ 	struct mm_struct *mm = get_task_mm(task);
+@@ -609,7 +603,8 @@ static ssize_t mem_read(struct file * fi
  	if (!task)
  		goto out_no_task;
  
@@ -161,7 +161,7 @@
  		goto out;
  
  	ret = -ENOMEM;
-@@ -615,7 +610,8 @@ static ssize_t mem_read(struct file * fi
+@@ -635,7 +630,8 @@ static ssize_t mem_read(struct file * fi
  
  		this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
  		retval = access_process_vm(task, src, page, this_len, 0);
@@ -171,7 +171,7 @@
  			if (!ret)
  				ret = -EIO;
  			break;
-@@ -659,7 +655,8 @@ static ssize_t mem_write(struct file * f
+@@ -679,7 +675,8 @@ static ssize_t mem_write(struct file * f
  	if (!task)
  		goto out_no_task;
  
@@ -279,7 +279,7 @@
  	kfree(loc);
 --- linux-2.6/fs/binfmt_aout.c
 +++ linux-2.6/fs/binfmt_aout.c
-@@ -448,12 +448,6 @@ beyond_if:
+@@ -447,12 +447,6 @@ beyond_if:
  	regs->gp = ex.a_gpvalue;
  #endif
  	start_thread(regs, ex.a_entry, current->mm->start_stack);
@@ -1564,7 +1564,7 @@
  	DEFINE(THREAD_VR0, offsetof(struct thread_struct, vr[0]));
 --- linux-2.6/arch/ia64/kernel/mca.c
 +++ linux-2.6/arch/ia64/kernel/mca.c
-@@ -1744,7 +1744,7 @@ format_mca_init_stack(void *mca_data, un
+@@ -1745,7 +1745,7 @@ format_mca_init_stack(void *mca_data, un
  	p->state = TASK_UNINTERRUPTIBLE;
  	cpu_set(cpu, p->cpus_allowed);
  	INIT_LIST_HEAD(&p->tasks);
@@ -2225,7 +2225,7 @@
 +	return -ENOSYS;
  }
  
- static int may_attach(struct task_struct *task)
+ int __ptrace_may_attach(struct task_struct *task)
 @@ -162,7 +76,6 @@ int ptrace_may_attach(struct task_struct
  int ptrace_attach(struct task_struct *task)
  {
@@ -2264,7 +2264,7 @@
 -	/* the same process cannot be attached many times */
 -	if (task->ptrace & PT_PTRACED)
  		goto bad;
- 	retval = may_attach(task);
+ 	retval = __ptrace_may_attach(task);
  	if (retval)
  		goto bad;
  
@@ -3038,7 +3038,7 @@
  
  #define PT_TRACE_MASK	0x000003f4
  
-@@ -91,25 +90,8 @@ extern int ptrace_detach(struct task_str
+@@ -91,26 +90,9 @@ extern int ptrace_detach(struct task_str
  extern void ptrace_disable(struct task_struct *);
  extern int ptrace_check_attach(struct task_struct *task, int kill);
  extern int ptrace_request(struct task_struct *child, long request, long addr, long data);
@@ -3048,6 +3048,7 @@
 -extern void __ptrace_unlink(struct task_struct *child);
 -extern void ptrace_untrace(struct task_struct *child);
  extern int ptrace_may_attach(struct task_struct *task);
+ extern int __ptrace_may_attach(struct task_struct *task);
  
 -static inline void ptrace_link(struct task_struct *child,
 -			       struct task_struct *new_parent)




More information about the fedora-extras-commits mailing list