diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-28 00:35:43 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-28 00:40:13 +0200 |
| commit | 7a6c813594c9eb25a9afbcbd30c9865e38ee6f39 (patch) | |
| tree | 79fd9daa9844311d4dfb9792a8d23e0f1bb184df | |
| parent | [IA64] Use new acpi_device_id struct for HID init in ia64/hp/common/sba_iommu.c (diff) | |
| download | linux-7a6c813594c9eb25a9afbcbd30c9865e38ee6f39.tar.xz linux-7a6c813594c9eb25a9afbcbd30c9865e38ee6f39.zip | |
[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/Kconfig | 3 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig | 3 | ||||
| -rw-r--r-- | fs/quota.c | 2 |
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 depends on IA32_SUPPORT default y +config COMPAT_FOR_U64_ALIGNMENT + def_bool COMPAT + config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." 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 depends on IA32_EMULATION default y +config COMPAT_FOR_U64_ALIGNMENT + def_bool COMPAT + config SYSVIPC_COMPAT bool 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 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. |