[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070720164850.GE14791@parisc-linux.org>
Date: Fri, 20 Jul 2007 10:48:50 -0600
From: Matthew Wilcox <matthew@....cx>
To: "Luck, Tony" <tony.luck@...el.com>
Cc: Randy Dunlap <randy.dunlap@...cle.com>, Andi Kleen <ak@...ell.com>,
Arthur Jones <arthur.jones@...gic.com>,
Vasily Tarasov <vtaras@...nvz.org>,
linux-kernel@...r.kernel.org, Jan Kara <jack@....cz>,
linux-arch@...r.kernel.org
Subject: Re: build fix for x86_64...
On Fri, Jul 20, 2007 at 09:20:15AM -0700, Luck, Tony wrote:
> Which is better. But if we unconditionally set this CONFIG variable, then the
> code in fs/quota.c will have to read:
>
> #if defined(CONFIG_COMPAT) && defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT)
>
> We can keep it simpler if the Kconfig file does the conditional for us:
>
> config COMPAT_FOR_U64_ALIGNMENT
> def_bool y
> depends on COMPAT
Ah, but you can do better:
config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT
I hand-edited your patch:
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 36c7b96..36c1582 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 14bf8ce..c77510b 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -753,6 +753,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.
--
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours. We can't possibly take such
a retrograde step."
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists