rpms/kernel/F-9 linux-2.6-stable-queue.patch,1.1,1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241

Modified Files:
	linux-2.6-stable-queue.patch 
Log Message:
remove pending stable patch that conflicts with utrace

linux-2.6-stable-queue.patch:

Index: linux-2.6-stable-queue.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-stable-queue.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-stable-queue.patch	4 Aug 2008 04:28:55 -0000	1.1
+++ linux-2.6-stable-queue.patch	4 Aug 2008 04:56:50 -0000	1.2
@@ -696,75 +696,6 @@
  	}
  
  	/* if we are on a dock station, we should register for dock
-Index: linux-2.6.25.noarch/arch/powerpc/kernel/ppc32.h
-===================================================================
---- linux-2.6.25.noarch.orig/arch/powerpc/kernel/ppc32.h
-+++ linux-2.6.25.noarch/arch/powerpc/kernel/ppc32.h
-@@ -135,4 +135,6 @@ struct ucontext32 { 
- 	struct mcontext32	uc_mcontext;
- };
- 
-+extern int copy_siginfo_to_user32(struct compat_siginfo __user *d, siginfo_t *s);
-+
- #endif  /* _PPC64_PPC32_H */
-Index: linux-2.6.25.noarch/arch/powerpc/kernel/ptrace32.c
-===================================================================
---- linux-2.6.25.noarch.orig/arch/powerpc/kernel/ptrace32.c
-+++ linux-2.6.25.noarch/arch/powerpc/kernel/ptrace32.c
-@@ -29,12 +29,15 @@
- #include <linux/security.h>
- #include <linux/signal.h>
- #include <linux/compat.h>
-+#include <linux/elf.h>
- 
- #include <asm/uaccess.h>
- #include <asm/page.h>
- #include <asm/pgtable.h>
- #include <asm/system.h>
- 
-+#include "ppc32.h"
-+
- /*
-  * does not yet catch signals sent when the child dies.
-  * in exit.c or in signal.c.
-@@ -64,6 +67,27 @@ static long compat_ptrace_old(struct tas
- 	return -EPERM;
- }
- 
-+static int compat_ptrace_getsiginfo(struct task_struct *child, compat_siginfo_t __user *data)
-+{
-+	siginfo_t lastinfo;
-+	int error = -ESRCH;
-+
-+	read_lock(&tasklist_lock);
-+	if (likely(child->sighand != NULL)) {
-+		error = -EINVAL;
-+		spin_lock_irq(&child->sighand->siglock);
-+		if (likely(child->last_siginfo != NULL)) {
-+			lastinfo = *child->last_siginfo;
-+			error = 0;
-+		}
-+		spin_unlock_irq(&child->sighand->siglock);
-+	}
-+	read_unlock(&tasklist_lock);
-+	if (!error)
-+		return copy_siginfo_to_user32(data, &lastinfo);
-+	return error;
-+}
-+
- long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
- 			compat_ulong_t caddr, compat_ulong_t cdata)
- {
-@@ -282,6 +306,9 @@ long compat_arch_ptrace(struct task_stru
- 			0, PT_REGS_COUNT * sizeof(compat_long_t),
- 			compat_ptr(data));
- 
-+	case PTRACE_GETSIGINFO:
-+		return compat_ptrace_getsiginfo(child, compat_ptr(data));
-+
- 	case PTRACE_GETFPREGS:
- 	case PTRACE_SETFPREGS:
- 	case PTRACE_GETVRREGS:
 Index: linux-2.6.25.noarch/drivers/acpi/thermal.c
 ===================================================================
 --- linux-2.6.25.noarch.orig/drivers/acpi/thermal.c