diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-04-13 08:12:17 -0400 |
| commit | 7c7145f6acc68100dbdc5d3c5c64fe3af1c99c89 (patch) | |
| tree | 5e93e3eb4787229032f1df222fa490112f4b0c32 /fs/ubifs/gc.c | |
| parent | 92d6b71ab906be706f3679353b30a8d2c3831144 (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'linus' into irq/core
Reason: Get the upstream IRQF_DISABLED related changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/ubifs/gc.c')
| -rw-r--r-- | fs/ubifs/gc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index e5a3d8e96bb..918d1582ca0 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | * good, and GC takes extra care when moving them. | 53 | * good, and GC takes extra care when moving them. |
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <linux/slab.h> | ||
| 56 | #include <linux/pagemap.h> | 57 | #include <linux/pagemap.h> |
| 57 | #include <linux/list_sort.h> | 58 | #include <linux/list_sort.h> |
| 58 | #include "ubifs.h" | 59 | #include "ubifs.h" |