diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:25 -0400 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /fs/squashfs/export.c | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/squashfs/export.c')
| -rw-r--r-- | fs/squashfs/export.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/export.c b/fs/squashfs/export.c index 69e971d5ddc1..2b1b8fe5e037 100644 --- a/fs/squashfs/export.c +++ b/fs/squashfs/export.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/dcache.h> | 40 | #include <linux/dcache.h> |
| 41 | #include <linux/exportfs.h> | 41 | #include <linux/exportfs.h> |
| 42 | #include <linux/zlib.h> | 42 | #include <linux/zlib.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include "squashfs_fs.h" | 45 | #include "squashfs_fs.h" |
| 45 | #include "squashfs_fs_sb.h" | 46 | #include "squashfs_fs_sb.h" |