From 81eabd4253c588a6d2034cb62febd9aff0a42a64 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Tue, 5 Jan 2010 15:34:50 +0900
Subject: [PATCH] --- yaml --- r: 185015 b: refs/heads/master c:
 79615760f380ec86cd58204744e774c33fab9211 h: refs/heads/master i:   185013:
 1139a8d0c135573a2ad9b8c29689e64e1607304c   185011:
 6819f0455239206989f72145b571a6bc518518f7   185007:
 1221306828aaae2571dc855bde48d063179c9f4e v: v3

---
 [refs]                                     | 2 +-
 trunk/include/linux/module.h               | 1 -
 trunk/kernel/trace/ring_buffer.c           | 1 +
 trunk/kernel/trace/ring_buffer_benchmark.c | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4462a451a1d..a92f3e5884c0 100644
--- 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
index 2302f09ea2d9..7e74ae0051cc 100644
--- 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
index 2326b04c95c4..eb6c8988c31a 100644
--- 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
index b2477caf09c2..df74c7982255 100644
--- 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;