aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2007-07-27 18:35:43 -0400
committerTony Luck <tony.luck@intel.com>2007-07-27 18:40:13 -0400
commit7a6c813594c9eb25a9afbcbd30c9865e38ee6f39 (patch)
tree79fd9daa9844311d4dfb9792a8d23e0f1bb184df
parent7091138fb762aed22317b4ff91eb211e7da3865c (diff)
[IA64] Fix build failure in fs/quota.c
b716395e2b8e450e294537de0c91476ded2f0395 added code to handle a compatability issue with 32bit quota tools, but the new compat routines are only needed when CONFIG_COMPAT=y (and with this set to 'n' there are compilation problems since some new typedefs are not visible). Reported by Doug Chapman. Fix tuned by a cast of thousands (Andi, Andreas, Arthur, HPA, Willy) Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/x86_64/Kconfig3
-rw-r--r--fs/quota.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 36c7b9682aa6..21aa4fc5f8ef 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -425,6 +425,9 @@ config COMPAT
425 depends on IA32_SUPPORT 425 depends on IA32_SUPPORT
426 default y 426 default y
427 427
428config COMPAT_FOR_U64_ALIGNMENT
429 def_bool COMPAT
430
428config IA64_MCA_RECOVERY 431config IA64_MCA_RECOVERY
429 tristate "MCA recovery from errors other than TLB." 432 tristate "MCA recovery from errors other than TLB."
430 433
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 45f82ae6d389..ffa036406289 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -765,6 +765,9 @@ config COMPAT
765 depends on IA32_EMULATION 765 depends on IA32_EMULATION
766 default y 766 default y
767 767
768config COMPAT_FOR_U64_ALIGNMENT
769 def_bool COMPAT
770
768config SYSVIPC_COMPAT 771config SYSVIPC_COMPAT
769 bool 772 bool
770 depends on COMPAT && SYSVIPC 773 depends on COMPAT && SYSVIPC
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
387 return ret; 387 return ret;
388} 388}
389 389
390#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) 390#if defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT)
391/* 391/*
392 * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64) 392 * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64)
393 * and is necessary due to alignment problems. 393 * and is necessary due to alignment problems.