From a135357dad5fb66736816438d363cb3eabefa5f5 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Tue, 22 Mar 2011 17:47:05 -0400
Subject: fix up utrace-ptrace for smp_lock removal

---
 kernel.spec                   | 1 +
 linux-2.6-utrace-ptrace.patch | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 6e5323db7..6ea2935de 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1960,6 +1960,7 @@ fi
 - Fix context in add-appleir-usb-driver.patch
 - Enable firewire ALSA modules, HP accelerometer driver.
 - Re-enable PSTORE, seems to be fixed.
+- Fix utrace-ptrace for upstream smp_lock removal.
 
 * Fri Mar 18 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc0.git6.0
 - Update to 2.6.38-git6
diff --git a/linux-2.6-utrace-ptrace.patch b/linux-2.6-utrace-ptrace.patch
index bc5681d95..9d6e729a7 100644
--- a/linux-2.6-utrace-ptrace.patch
+++ b/linux-2.6-utrace-ptrace.patch
@@ -48,7 +48,7 @@ new file mode 100644
 index ...a5bcb9e 100644  
 --- /dev/null
 +++ b/kernel/ptrace-utrace.c
-@@ -0,0 +1,1187 @@
+@@ -0,0 +1,1186 @@
 +/*
 + * linux/kernel/ptrace.c
 + *
@@ -65,7 +65,6 @@ index ...a5bcb9e 100644
 +#include <linux/mm.h>
 +#include <linux/highmem.h>
 +#include <linux/pagemap.h>
-+#include <linux/smp_lock.h>
 +#include <linux/ptrace.h>
 +#include <linux/utrace.h>
 +#include <linux/security.h>
-- 
cgit