From f5ff1fb737b983e8997da0bd19f70bd56135666d Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 4 Aug 2008 13:56:01 -0700
Subject: [PATCH] --- yaml --- r: 107585 b: refs/heads/master c:
 115a326c1e5cab457924356123bbfd7d783ecf9d h: refs/heads/master i:   107583:
 41b351929afb5a9064d93214eeb010bed714e7ee v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/tracehook.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e7eef9fce2ca..5c69e6a88874 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f6db95dcfa68e93bafe435381299abbffb5c7e
+refs/heads/master: 115a326c1e5cab457924356123bbfd7d783ecf9d
diff --git a/trunk/include/linux/tracehook.h b/trunk/include/linux/tracehook.h
index 12532839f508..ab3ef7aefa95 100644
--- a/trunk/include/linux/tracehook.h
+++ b/trunk/include/linux/tracehook.h
@@ -487,6 +487,9 @@ static inline int tracehook_notify_jctl(int notify, int why)
 	return notify || (current->ptrace & PT_PTRACED);
 }
 
+#define DEATH_REAP			-1
+#define DEATH_DELAYED_GROUP_LEADER	-2
+
 /**
  * tracehook_notify_death - task is dead, ready to notify parent
  * @task:		@current task now exiting
@@ -501,8 +504,6 @@ static inline int tracehook_notify_jctl(int notify, int why)
  *
  * Called with write_lock_irq(&tasklist_lock) held.
  */
-#define DEATH_REAP			-1
-#define DEATH_DELAYED_GROUP_LEADER	-2
 static inline int tracehook_notify_death(struct task_struct *task,
 					 void **death_cookie, int group_dead)
 {