2010-01-04 22:38:43

by Christoph Lameter

[permalink] [raw]
Subject: [this_cpu_xx V9 3/7] Move local.h include to ringbuffer.c and ring_buffer_benchmark.c

ringbuffer*.c are the last users of local.h.

Remove the include from modules.h and add it to ringbuffer files.

Signed-off-by: Christoph Lameter <[email protected]>

---
include/linux/module.h | 1 -
kernel/trace/ring_buffer.c | 1 +
kernel/trace/ring_buffer_benchmark.c | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6/include/linux/module.h
===================================================================
--- linux-2.6.orig/include/linux/module.h 2010-01-04 16:21:31.000000000 -0600
+++ linux-2.6/include/linux/module.h 2010-01-04 16:21:33.000000000 -0600
@@ -17,7 +17,6 @@
#include <linux/moduleparam.h>
#include <linux/tracepoint.h>

-#include <asm/local.h>
#include <linux/percpu.h>
#include <asm/module.h>

Index: linux-2.6/kernel/trace/ring_buffer.c
===================================================================
--- linux-2.6.orig/kernel/trace/ring_buffer.c 2010-01-04 16:21:20.000000000 -0600
+++ linux-2.6/kernel/trace/ring_buffer.c 2010-01-04 16:22:30.000000000 -0600
@@ -20,6 +20,7 @@
#include <linux/cpu.h>
#include <linux/fs.h>

+#include <asm/local.h>
#include "trace.h"

/*
Index: linux-2.6/kernel/trace/ring_buffer_benchmark.c
===================================================================
--- linux-2.6.orig/kernel/trace/ring_buffer_benchmark.c 2010-01-04 16:21:47.000000000 -0600
+++ linux-2.6/kernel/trace/ring_buffer_benchmark.c 2010-01-04 16:21:57.000000000 -0600
@@ -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;

--