From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Date: Sun, 26 Oct 2008 12:38:31 +0000 Subject: Re: [PATCH] kvm: external module: fix unifdef problem Message-Id: <490464C7.1020804@redhat.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="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org 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 > > 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 = mv $1 $1.orig && \ > gawk -v version=$(version) -f $(ARCH_DIR)/hack-module.awk $1.orig \ > | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig > > +unifdef_uflags = $(foreach arch, $(NONARCH_CONFIG), -UCONFIG_$(arch)) > $(patsubst ...), or even $(NONARCH_CONFIG:%=-UCONFIG_%) But I think NONARCH_CONFIG needs to be adjusted as well. -- error compiling committee.c: too many arguments to function