From mboxrd@z Thu Jan 1 00:00:00 1970 From: ehrhardt@linux.vnet.ibm.com Subject: [PATCH 2/3] kvm: external module: Treat NONARCH_CONFIG as a list Date: Tue, 28 Oct 2008 10:08:21 +0100 Message-ID: <1225184901-25731-1-git-send-email-ehrhardt@linux.vnet.ibm.com> Cc: hollisb@us.ibm.com, ehrhardt@linux.vnet.ibm.com To: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, avi@qumranet.com Return-path: Received: from mtagate2.uk.ibm.com ([194.196.100.162]:51389 "EHLO mtagate2.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbYJ1JIZ (ORCPT ); Tue, 28 Oct 2008 05:08:25 -0400 Sender: kvm-owner@vger.kernel.org List-ID: From: Hollis Blanchard As discussed on the list the unifdef changes break powerpc (and more ?). A fix is to treat NONARCH_CONFIG as a list instead of a single item. Signed-off-by: Hollis Blanchard Signed-off-by: Christian Ehrhardt --- [diffstat] Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) [diff] diff --git a/kernel/Makefile b/kernel/Makefile --- a/kernel/Makefile +++ b/kernel/Makefile @@ -25,8 +25,9 @@ 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)) unifdef = mv $1 $1.orig && \ - unifdef -DCONFIG_$(ARCH_CONFIG) -UCONFIG_$(NONARCH_CONFIG) $1.orig > $1; \ + unifdef -DCONFIG_$(ARCH_CONFIG) $(unifdef_uflags) $1.orig > $1; \ [ $$? -le 2 ] && rm $1.orig hack = $(call _hack,$T/$(strip $1))