lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IA64] Fix build failure in fs/quota.c

Browse Source 
b716395e2b 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>
This commit is contained in:
Tony Luck
2007-07-27 15:35:43 -07:00
parent 7091138fb7
commit 7a6c813594
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/Kconfig
View File

@@ -425,6 +425,9 @@ config COMPAT
depends on IA32_SUPPORT depends on IA32_SUPPORT
default y default y
config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT
config IA64_MCA_RECOVERY config IA64_MCA_RECOVERY
tristate "MCA recovery from errors other than TLB." tristate "MCA recovery from errors other than TLB."

3
arch/x86_64/Kconfig
View File

@@ -765,6 +765,9 @@ config COMPAT
depends on IA32_EMULATION depends on IA32_EMULATION
default y default y
config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT
config SYSVIPC_COMPAT config SYSVIPC_COMPAT
bool bool
depends on COMPAT && SYSVIPC depends on COMPAT && SYSVIPC

2
fs/quota.c
View File

@@ -387,7 +387,7 @@ asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special, qid_t
return ret; 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) * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64)
* and is necessary due to alignment problems. * and is necessary due to alignment problems.