Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6c8135 authored by Tony Luck's avatar Tony Luck
Browse files

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



b716395e 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: default avatarTony Luck <tony.luck@intel.com>
parent 7091138f

arch/ia64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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."

arch/x86_64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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

fs/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -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.