From patchwork Wed Jun  3 12:58:40 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: James Pike <james@chilon.net>
X-Patchwork-Id: 27659
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n53D6cnC006421
	for <patchwork-kvm@patchwork.kernel.org>; Wed, 3 Jun 2009 13:06:38 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754009AbZFCNGe (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 3 Jun 2009 09:06:34 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752385AbZFCNGe
	(ORCPT <rfc822;kvm-outgoing>); Wed, 3 Jun 2009 09:06:34 -0400
Received: from mail-fx0-f168.google.com ([209.85.220.168]:61696 "EHLO
	mail-fx0-f168.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753406AbZFCNGd (ORCPT <rfc822; kvm@vger.kernel.org>);
	Wed, 3 Jun 2009 09:06:33 -0400
Received: by fxm12 with SMTP id 12so7380191fxm.37
	for <kvm@vger.kernel.org>; Wed, 03 Jun 2009 06:06:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:sender:date:from:to:subject
	:message-id:mime-version:content-type:content-disposition:user-agent;
	bh=vQpZoF7LdTdvKN5DlA68unIYIIz0ZDDWdTBZPnevYNM=;
	b=BlYXI1xS4RIPrOI70XGvXi68yvQEJDHk1TwpyascXEGyErUTxDCFa/zRFrLlj/18Ry
	Pd2m0ne4iKm7K+yb3lnlmBI/+ppMXCVzZQXOH7MCDFl/U5n8JmfMKE4kLJCiiV3jCqgI
	w5knoVvyZAk6rbUrgv5eZimKG/4rFhWnSjZDw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=sender:date:from:to:subject:message-id:mime-version:content-type
	:content-disposition:user-agent;
	b=Px80qRRK2G15DrOxCLxdiME0zhBoKQWnlbmS8oBqW6pA2lZcGri5FW9620+s5pPUKB
	gdGAkLxXxSnAW0QJlnPiog5VGwgDbhQJNYOXe1qM3SHsW8pak2jpVqRz1iXEZnCXzIWD
	RVTfDWxiYz/KsFvNW4UHyZRwOZkmIrVguXlFw=
Received: by 10.103.168.12 with SMTP id v12mr597607muo.45.1244033924462;
	Wed, 03 Jun 2009 05:58:44 -0700 (PDT)
Received: from dupont.ts-a (78-105-13-9.zone3.bethere.co.uk [78.105.13.9])
	by mx.google.com with ESMTPS id u26sm436447mug.22.2009.06.03.05.58.42
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 03 Jun 2009 05:58:44 -0700 (PDT)
Date: Wed, 3 Jun 2009 13:58:40 +0100
From: James Pike <james@chilon.net>
To: kvm@vger.kernel.org
Subject: [PATCH] fix include paths when the kernel source and build
	directory are different
Message-ID: <20090603125840.GA16209@dupont.ts-a>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.19 (2009-01-05)
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org

Use correct architecture includes when kernel source and build directory
are different.
Signed-off-by: James Pike <james@chilon.net>
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/Makefile b/Makefile
index 95e4c81..ad08c45 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,9 @@ all:: prerequisite
 #	include header priority 1) $LINUX 2) $KERNELDIR 3) include-compat
 	$(MAKE) -C $(KERNELDIR) M=`pwd` \
 		LINUXINCLUDE="-I`pwd`/include -Iinclude \
-		$(if $(KERNELSOURCEDIR),-Iinclude2 -I$(KERNELSOURCEDIR)/include) \
-		-Iarch/${ARCH_DIR}/include -I`pwd`/include-compat \
+		$(if $(KERNELSOURCEDIR),\
+			-Iinclude2 -I$(KERNELSOURCEDIR)/include -I$(KERNELSOURCEDIR)/arch/${ARCH_DIR}/include, \
+			-Iarch/${ARCH_DIR}/include) -I`pwd`/include-compat \
 		-include include/linux/autoconf.h \
 		-include `pwd`/$(ARCH_DIR)/external-module-compat.h $(module_defines)" \
 		"$$@"