diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 22:33:57 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 22:33:57 +0400 |
commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /fs/stat.c | |
parent | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (diff) | |
parent | 330ab71619bacc4d4494227a6cfc9b7f5500403d (diff) | |
download | linux-1fb5fef9b80d9a3b5368e22031627afd1585487b.tar.xz |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/stat.c')
-rw-r--r-- | fs/stat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/stat.c b/fs/stat.c index 9948cc1685a4..0f282face322 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -261,7 +261,7 @@ asmlinkage long sys_newlstat(char __user *filename, struct stat __user *statbuf) return error; } -#ifndef __ARCH_WANT_STAT64 +#if !defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_SYS_NEWFSTATAT) asmlinkage long sys_newfstatat(int dfd, char __user *filename, struct stat __user *statbuf, int flag) { |