diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
| commit | 35385d7a83b4cae6d5ea5f80f3b3377d94178344 (patch) | |
| tree | 49494d95dfef31ba4f9a697d31e4028cf65a57bd /kernel | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/acct.c | 1 | ||||
| -rw-r--r-- | kernel/ksyms.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 6eacd87b3..e2e8826fa 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -49,6 +49,7 @@ #ifdef CONFIG_BSD_PROCESS_ACCT #include <linux/mm.h> +#include <linux/slab.h> #include <linux/acct.h> #include <linux/smp_lock.h> #include <linux/file.h> diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 440aaf9f5..32ce9a7d6 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -56,7 +56,7 @@ extern int console_loglevel; extern void set_device_ro(kdev_t dev,int flag); #if !defined(CONFIG_NFSD) && defined(CONFIG_NFSD_MODULE) -extern int (*do_nfsservctl)(int, void *, void *); +extern long (*do_nfsservctl)(int, void *, void *); #endif extern void *sys_call_table; @@ -151,6 +151,7 @@ EXPORT_SYMBOL(sys_close); EXPORT_SYMBOL(dcache_lock); EXPORT_SYMBOL(d_alloc_root); EXPORT_SYMBOL(d_delete); +EXPORT_SYMBOL(dget_locked); EXPORT_SYMBOL(d_validate); EXPORT_SYMBOL(d_rehash); EXPORT_SYMBOL(d_invalidate); /* May be it will be better in dcache.h? */ |