From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Ehrhardt Date: Mon, 27 Oct 2008 16:07:05 +0000 Subject: Re: [PATCH] kvm: external module: fix unifdef problem Message-Id: <4905E729.1020301@linux.vnet.ibm.com> List-Id: References: <1224871854.9634.50.camel@localhost.localdomain> In-Reply-To: <1224871854.9634.50.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: kvm-ppc@vger.kernel.org Hi Avi, Hollis and I discussed how to continue on that. Atm the upstream code is broken for powerpc and your response is too=20 vague for me to extend our patch in some way. So which way should we go? Will you apply (or should I resubmit ?)=20 Hollis patch for now to fix upstream for powerpc. And we/you extend it=20 later or what else would you prefer? Avi Kivity wrote: > Hollis Blanchard wrote: >> Guys, I don't mind if you add new things that aren't enabled for other >> architectures, but please try to be a little more careful about breaking >> us. >> >> This patch results in the following on PowerPC: >> mv $i $i.orig && unifdef -DCONFIG_POWERPC -UCONFIG_X86 IA64 >> $i.orig > $i; [ $? -le 2 ] && rm $i.orig; done >> unifdef: can only do one file >> >> =20 > > Aw. > >> Here's my proposed fix: >> >> kvm: external module: Treat NONARCH_CONFIG as a list, not a single item. >> >> Signed-off-by: Hollis Blanchard >> >> diff --git a/kernel/Makefile b/kernel/Makefile >> --- a/kernel/Makefile >> +++ b/kernel/Makefile >> @@ -25,8 +25,9 @@ _hack =3D mv $1 $1.orig && \ >> gawk -v version=3D$(version) -f $(ARCH_DIR)/hack-module.awk $1.orig= \ >> | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig >> =20 >> +unifdef_uflags =3D $(foreach arch, $(NONARCH_CONFIG), -UCONFIG_$(arch)) >> =20 > > $(patsubst ...), or even $(NONARCH_CONFIG:%=3D-UCONFIG_%) > > But I think NONARCH_CONFIG needs to be adjusted as well. > --=20 Gr=FCsse / regards,=20 Christian Ehrhardt IBM Linux Technology Center, Open Virtualization