summaryrefslogtreecommitdiffstats
path: root/linux-2.6-utrace.patch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-10-22 12:24:02 -0400
committerKyle McMartin <kyle@mcmartin.ca>2010-10-22 12:24:02 -0400
commitc22cea221f8de78ab36ce0f183b73c99031cc7dc (patch)
tree03d0921c8157e6a2e2dd113cfb3be75ccd1a9aaa /linux-2.6-utrace.patch
parenta791768570bae98c698d212d363f6c36ac5d42e5 (diff)
downloadkernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.gz
kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.xz
kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.zip
start following git head again
Diffstat (limited to 'linux-2.6-utrace.patch')
-rw-r--r--linux-2.6-utrace.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6-utrace.patch b/linux-2.6-utrace.patch
index a12357e68..d9f81cdf7 100644
--- a/linux-2.6-utrace.patch
+++ b/linux-2.6-utrace.patch
@@ -1636,9 +1636,9 @@ index 2de5b1c..a283086 100644
+ kernel interface exported to kernel modules, to track events in
+ user threads, extract and change user thread state.
+
- menu "RCU Subsystem"
+ source "kernel/irq/Kconfig"
- choice
+ menu "RCU Subsystem"
diff --git a/kernel/Makefile b/kernel/Makefile
index 0b72d1a..6004913 100644
--- a/kernel/Makefile