diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 14:23:57 +0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 14:23:57 +0400 |
commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /fs/quota.c | |
parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
download | linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/quota.c')
-rw-r--r-- | fs/quota.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota.c b/fs/quota.c index e6577ac15a6c..99b24b52bfc8 100644 --- a/fs/quota.c +++ b/fs/quota.c @@ -387,7 +387,7 @@ asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special, qid_t return ret; } -#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) +#if defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT) /* * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64) * and is necessary due to alignment problems. |