---

yaml --- r: 185015 b: refs/heads/master c: 7961576 h: refs/heads/master i: 185013: 1139a8d 185011: 6819f04 185007: 1221306 v: v3
git-mirror · Jan 5, 2010 · 81eabd4 · 81eabd4
1 parent a82762a
commit 81eabd4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1783a240f491fb233f04edc042e16b18a7a79ba
+refs/heads/master: 79615760f380ec86cd58204744e774c33fab9211
diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h
@@ -17,7 +17,6 @@
 #include <linux/moduleparam.h>
 #include <linux/tracepoint.h>
 
-#include <asm/local.h>
 #include <linux/percpu.h>
 #include <asm/module.h>
 

diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -20,6 +20,7 @@
 #include <linux/cpu.h>
 #include <linux/fs.h>
 
+#include <asm/local.h>
 #include "trace.h"
 
 /*

diff --git a/trunk/kernel/trace/ring_buffer_benchmark.c b/trunk/kernel/trace/ring_buffer_benchmark.c
@@ -8,6 +8,7 @@
 #include <linux/kthread.h>
 #include <linux/module.h>
 #include <linux/time.h>
+#include <asm/local.h>
 
 struct rb_page {
 	u64		ts;