diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/alpha | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/defconfig | 1 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 13 | ||||
| -rw-r--r-- | arch/alpha/lib/copy_user.S | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index 40676926c..37d7a8630 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -361,6 +361,7 @@ CONFIG_ISO9660_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 299a1b338..398de179c 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -302,17 +302,14 @@ static int do_osf_statfs(struct dentry * dentry, struct osf_statfs *buffer, unsi asmlinkage int osf_statfs(char *path, struct osf_statfs *buffer, unsigned long bufsiz) { - struct dentry *dentry; + struct nameidata nd; int retval; - lock_kernel(); - dentry = namei(path); - retval = PTR_ERR(dentry); - if (!IS_ERR(dentry)) { - retval = do_osf_statfs(dentry, buffer, bufsiz); - dput(dentry); + retval = user_path_walk(path, &nd); + if (!retval) { + retval = do_osf_statfs(nd.dentry, buffer, bufsiz); + path_release(&nd); } - unlock_kernel(); return retval; } diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S index 7cc7382ab..d8f1a24cf 100644 --- a/arch/alpha/lib/copy_user.S +++ b/arch/alpha/lib/copy_user.S @@ -80,7 +80,7 @@ $50: extql $3,$7,$3 extqh $2,$7,$1 bis $3,$1,$1 - stq $1,0($6) + EXO( stq $1,0($6) ) addq $7,8,$7 subq $0,8,$0 addq $6,8,$6 |