diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 12:39:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 12:39:11 -0400 |
commit | b66696e3c0d8fc01efdbc701eba1276618332cb3 (patch) | |
tree | 3094ef42787b8e0c900bce1f2391ced081ed1ba4 /fs/isofs | |
parent | 9e74e7c81a24aee66024fc477786bd1de84e293b (diff) | |
parent | a32f3926632e71c8aa23ce32fe2625f8d5f792c2 (diff) |
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
eeepc-wmi: include slab.h
staging/otus: include slab.h from usbdrv.h
percpu: don't implicitly include slab.h from percpu.h
kmemcheck: Fix build errors due to missing slab.h
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h
Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.
Diffstat (limited to 'fs/isofs')
-rw-r--r-- | fs/isofs/dir.c | 1 | ||||
-rw-r--r-- | fs/isofs/namei.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 8ba5441063be..b9ab69b3a482 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * isofs directory handling functions | 11 | * isofs directory handling functions |
12 | */ | 12 | */ |
13 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
14 | #include <linux/gfp.h> | ||
14 | #include "isofs.h" | 15 | #include "isofs.h" |
15 | 16 | ||
16 | int isofs_name_translate(struct iso_directory_record *de, char *new, struct inode *inode) | 17 | int isofs_name_translate(struct iso_directory_record *de, char *new, struct inode *inode) |
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index eaa831311c9c..ab438beb867c 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/smp_lock.h> | 9 | #include <linux/smp_lock.h> |
10 | #include <linux/gfp.h> | ||
10 | #include "isofs.h" | 11 | #include "isofs.h" |
11 | 12 | ||
12 | /* | 13 | /* |