rpms/kernel/devel config-ia64, 1.2, 1.3 config-ia64-generic, 1.12, 1.13 kernel.spec, 1.761, 1.762 linux-2.6-tracehook.patch, 1.3, 1.4 linux-2.6-utrace.patch, 1.81, 1.82
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Mon Jul 14 19:39:32 UTC 2008
Author: roland
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23544
Modified Files:
config-ia64 config-ia64-generic kernel.spec
linux-2.6-tracehook.patch linux-2.6-utrace.patch
Log Message:
Fix ia64 build nit, properly disable utrace for ia64.
Index: config-ia64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-ia64 9 Jul 2008 03:37:06 -0000 1.2
+++ config-ia64 14 Jul 2008 19:38:29 -0000 1.3
@@ -1,4 +1,2 @@
CONFIG_CRASH_DUMP=y
CONFIG_PROC_VMCORE=y
-
-CONFIG_UTRACE=n
Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-ia64-generic 23 Jun 2008 20:46:06 -0000 1.12
+++ config-ia64-generic 14 Jul 2008 19:38:29 -0000 1.13
@@ -201,3 +201,6 @@
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
+
+CONFIG_UTRACE=n
+CONFIG_UTRACE_PTRACE=n
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -r1.761 -r1.762
--- kernel.spec 14 Jul 2008 17:24:20 -0000 1.761
+++ kernel.spec 14 Jul 2008 19:38:29 -0000 1.762
@@ -1788,6 +1788,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Mon Jul 14 2008 Roland McGrath <roland at redhat.com>
+- Fix ia64 build nit, properly disable utrace for ia64.
+
* Mon Jul 14 2008 Dave Jones <davej at redhat.com>
- Improve 8139too PIO patch with jgarziks comments.
linux-2.6-tracehook.patch:
Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-tracehook.patch 14 Jul 2008 07:51:15 -0000 1.3
+++ linux-2.6-tracehook.patch 14 Jul 2008 19:38:29 -0000 1.4
@@ -1,7 +1,7 @@
arch/Kconfig | 18 ++
arch/ia64/Kconfig | 1 +
arch/ia64/kernel/perfmon.c | 11 +-
- arch/ia64/kernel/process.c | 21 +-
+ arch/ia64/kernel/process.c | 22 +-
arch/ia64/kernel/ptrace.c | 43 +--
arch/ia64/kernel/signal.c | 8 +
arch/mips/kernel/irixelf.c | 2 -
@@ -53,7 +53,7 @@
lib/syscall.c | 75 +++++
mm/nommu.c | 4 +-
security/selinux/hooks.c | 22 +--
- 55 files changed, 1589 insertions(+), 371 deletions(-)
+ 55 files changed, 1590 insertions(+), 371 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 3ea332b..1955fbd 100644
@@ -151,10 +151,18 @@
/*
* defer until state is changed (shorten spin window). the context is locked
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
-index a3a34b4..ff448fe 100644
+index a3a34b4..5164aab 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
-@@ -156,21 +156,6 @@ show_regs (struct pt_regs *regs)
+@@ -28,6 +28,7 @@
+ #include <linux/delay.h>
+ #include <linux/kdebug.h>
+ #include <linux/utsname.h>
++#include <linux/tracehook.h>
+
+ #include <asm/cpu.h>
+ #include <asm/delay.h>
+@@ -156,21 +157,6 @@ show_regs (struct pt_regs *regs)
show_stack(NULL, NULL);
}
@@ -176,7 +184,7 @@
void
do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
{
-@@ -199,6 +184,11 @@ do_notify_resume_user(sigset_t *unused,
+@@ -199,6 +185,11 @@ do_notify_resume_user(sigset_t *unused,
ia64_do_signal(scr, in_syscall);
}
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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- linux-2.6-utrace.patch 14 Jul 2008 07:51:15 -0000 1.81
+++ linux-2.6-utrace.patch 14 Jul 2008 19:38:29 -0000 1.82
@@ -10,8 +10,8 @@
kernel/Makefile | 1 +
kernel/ptrace.c | 542 +++++++++-
kernel/signal.c | 14 +-
- kernel/utrace.c | 2222 +++++++++++++++++++++++++++++++++++++
- 13 files changed, 4023 insertions(+), 4 deletions(-)
+ kernel/utrace.c | 2211 +++++++++++++++++++++++++++++++++++++
+ 13 files changed, 4012 insertions(+), 4 deletions(-)
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 0eb0d02..49a78b7 100644
@@ -2215,10 +2215,10 @@
struct pt_regs *regs, void *cookie)
diff --git a/kernel/utrace.c b/kernel/utrace.c
new file mode 100644
-index ...84540a4 100644
+index ...c965b2e 100644
--- /dev/null
+++ b/kernel/utrace.c
-@@ -0,0 +1,2222 @@
+@@ -0,0 +1,2211 @@
+/*
+ * utrace infrastructure interface for debugging user processes
+ *
@@ -2273,12 +2273,7 @@
+ struct rcu_head dead;
+ struct {
+ struct task_struct *cloning;
-+ struct utrace_signal *signal;
+ } live;
-+ struct {
-+ unsigned int death:1; /* in utrace_report_death() now */
-+ unsigned int reap:1; /* release_task() has run */
-+ } exit;
+ } u;
+
+ struct list_head engines;
@@ -2291,6 +2286,8 @@
+ unsigned int report:1;
+ unsigned int interrupt:1;
+ unsigned int signal_handler:1;
++ unsigned int death:1; /* in utrace_report_death() now */
++ unsigned int reap:1; /* release_task() has run */
+};
+
+static struct kmem_cache *utrace_cachep;
@@ -2332,16 +2329,10 @@
+ }
+ }
+
-+ utrace = kmem_cache_alloc(utrace_cachep, GFP_KERNEL);
++ utrace = kmem_cache_zalloc(utrace_cachep, GFP_KERNEL);
+ if (unlikely(utrace == NULL))
+ return ERR_PTR(-ENOMEM);
+
-+ utrace->u.live.cloning = NULL;
-+ utrace->u.live.signal = NULL;
-+ utrace->stopped = 0;
-+ utrace->report = 0;
-+ utrace->interrupt = 0;
-+ utrace->signal_handler = 0;
+ INIT_LIST_HEAD(&utrace->engines);
+ list_add(&engine->entry, &utrace->engines);
+ spin_lock_init(&utrace->lock);
@@ -2806,7 +2797,7 @@
+ * utrace->lock race. All we have to do is let RCU run.
+ */
+ if (likely(!list_empty(&utrace->engines))) {
-+ utrace->u.exit.reap = 1;
++ utrace->reap = 1;
+
+ if (!(target->utrace_flags & DEATH_EVENTS)) {
+ utrace_reap(target, utrace); /* Unlocks and frees. */
@@ -2891,10 +2882,8 @@
+
+ if (target->exit_state &&
+ (((events &~ old_flags) & DEATH_EVENTS) ||
-+ (utrace->u.exit.death &&
-+ ((old_flags &~ events) & DEATH_EVENTS)) ||
-+ (utrace->u.exit.reap &&
-+ ((old_flags &~ events) & UTRACE_EVENT(REAP))))) {
++ (utrace->death && ((old_flags &~ events) & DEATH_EVENTS)) ||
++ (utrace->reap && ((old_flags &~ events) & UTRACE_EVENT(REAP))))) {
+ spin_unlock(&utrace->lock);
+ return -EALREADY;
+ }
@@ -3075,7 +3064,7 @@
+ }
+
+ if (task->exit_state) {
-+ BUG_ON(utrace->u.exit.death);
++ BUG_ON(utrace->death);
+ flags &= DEAD_FLAGS_MASK;
+ wake = false;
+ } else if (!(flags & UTRACE_EVENT_SYSCALL) &&
@@ -3255,11 +3244,11 @@
+ * prevents us from racing with it detaching itself.
+ */
+ if (action != UTRACE_DETACH ||
-+ unlikely(utrace->u.exit.reap)) {
++ unlikely(utrace->reap)) {
+ spin_unlock(&utrace->lock);
+ return -ESRCH;
+ } else if (unlikely(target->utrace_flags & DEATH_EVENTS) ||
-+ unlikely(utrace->u.exit.death)) {
++ unlikely(utrace->death)) {
+ /*
+ * We have already started the death report, or
+ * are about to very soon. We can't prevent
@@ -3764,8 +3753,8 @@
+ * of detach bookkeeping.
+ */
+ spin_lock(&utrace->lock);
-+ BUG_ON(utrace->u.exit.death);
-+ utrace->u.exit.death = 1;
++ BUG_ON(utrace->death);
++ utrace->death = 1;
+ utrace->report = 0;
+ utrace->interrupt = 0;
+ spin_unlock(&utrace->lock);
@@ -3780,9 +3769,9 @@
+ * this flag clear, competing utrace_control/utrace_set_events calls
+ * know that we've finished our callbacks and any detach bookkeeping.
+ */
-+ utrace->u.exit.death = 0;
++ utrace->death = 0;
+
-+ if (utrace->u.exit.reap)
++ if (utrace->reap)
+ /*
+ * utrace_release_task() was already called in parallel.
+ * We must complete its work now.
More information about the scm-commits
mailing list