diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 15:10:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 15:10:12 -0400 |
| commit | 6c9fcaf2eec1b9f85226a694230dd957dd7926b3 (patch) | |
| tree | f8c824c6c64dc411752c844f116e693760768bcc /kernel/rcupreempt_trace.c | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
| parent | 199a952876adbfc2b6c13b8b07adabebf4ff54b2 (diff) | |
Merge branch 'core/rcu' into core/rcu-for-linus
Diffstat (limited to 'kernel/rcupreempt_trace.c')
| -rw-r--r-- | kernel/rcupreempt_trace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/rcupreempt_trace.c b/kernel/rcupreempt_trace.c index 49ac4947af24..5edf82c34bbc 100644 --- a/kernel/rcupreempt_trace.c +++ b/kernel/rcupreempt_trace.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/moduleparam.h> | 38 | #include <linux/moduleparam.h> |
| 39 | #include <linux/percpu.h> | 39 | #include <linux/percpu.h> |
| 40 | #include <linux/notifier.h> | 40 | #include <linux/notifier.h> |
| 41 | #include <linux/rcupdate.h> | ||
| 42 | #include <linux/cpu.h> | 41 | #include <linux/cpu.h> |
| 43 | #include <linux/mutex.h> | 42 | #include <linux/mutex.h> |
| 44 | #include <linux/rcupreempt_trace.h> | 43 | #include <linux/rcupreempt_trace.h> |