diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/nfsd | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 8 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 68e7a1dac..b0aac3280 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -29,13 +29,7 @@ #include <linux/nfsd/xdr.h> #include <linux/nfsd/syscall.h> -#if LINUX_VERSION_CODE >= 0x020100 #include <asm/uaccess.h> -#else -# define copy_from_user memcpy_fromfs -# define copy_to_user memcpy_tofs -# define access_ok !verify_area -#endif #include <linux/smp.h> #include <linux/smp_lock.h> @@ -249,10 +243,8 @@ done: #ifdef MODULE /* New-style module support since 2.1.18 */ -#if LINUX_VERSION_CODE >= 131346 EXPORT_NO_SYMBOLS; MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>"); -#endif extern int (*do_nfsservctl)(int, void *, void *); diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 95bec2fc5..b1af9399e 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -39,9 +39,7 @@ #include <linux/nfsd/nfsfh.h> #include <linux/quotaops.h> -#if LINUX_VERSION_CODE >= 0x020100 #include <asm/uaccess.h> -#endif #define NFSDDBG_FACILITY NFSDDBG_FILEOP #define NFSD_PARANOIA |