diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 03:06:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 04:18:47 -0400 |
| commit | c1ab9cab75098924fa8226a8a371de66977439df (patch) | |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb /fs/logfs/readwrite.c | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/logfs/readwrite.c')
| -rw-r--r-- | fs/logfs/readwrite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index c3a3a6814b84..bff40253dfb2 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | */ | 18 | */ |
| 19 | #include "logfs.h" | 19 | #include "logfs.h" |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | static u64 adjust_bix(u64 bix, level_t level) | 23 | static u64 adjust_bix(u64 bix, level_t level) |
| 23 | { | 24 | { |