Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7a6c813594c9eb25a9afbcbd30c9865e38ee6f39 Commit: 7a6c813594c9eb25a9afbcbd30c9865e38ee6f39 Parent: 7091138fb762aed22317b4ff91eb211e7da3865c Author: Tony Luck <[EMAIL PROTECTED]> AuthorDate: Fri Jul 27 15:35:43 2007 -0700 Committer: Tony Luck <[EMAIL PROTECTED]> CommitDate: Fri Jul 27 15:40:13 2007 -0700
[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 <[EMAIL PROTECTED]> --- arch/ia64/Kconfig | 3 +++ arch/x86_64/Kconfig | 3 +++ fs/quota.c | 2 +- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 36c7b96..21aa4fc 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 45f82ae..ffa0364 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 e6577ac..99b24b5 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. - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html