From patchwork Wed Jun 9 08:35:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Date: Tue, 08 Jun 2010 22:35:51 -0000 From: Ike Panhc X-Patchwork-Id: 55057 Message-Id: <1276072551-19182-1-git-send-email-ike.pan@canonical.com> To: kernel-team@lists.ubuntu.com This patch is going to fix the compile error on Hardy netbook-lpia branch after rebase the lastest Hardy master branch. Though CONFIG_LGUEST_GUEST is not set on Hardy master branch, it is still good for a fix if someone want to enable this config with Hardy master branch and compile his own kernel. Please ACK/NAK for Hardy netbook-lpia branch and master branch. ======== 8< ======== The following changes since commit f939e8b6e0f2e9bdc3c7f0fdea1721ab234b7fb1: Ike Panhc (1): UBUNTU: Rebased to 2.6.24-28.70 are available in the git repository at: git://kernel.ubuntu.com/ikepanhc/hardy-kernel/.git fix-netbook-lpia Ike Panhc (1): UBUNTU: SAUCE: Fix compile error on arch/x86/lguest/boot.c arch/x86/lguest/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ======== 8< ======== >From c7919f4207dfe63b28bc1a74b3525d6ddf492996 Mon Sep 17 00:00:00 2001 From: Ike Panhc Date: Wed, 9 Jun 2010 15:33:44 +0800 Subject: [PATCH] UBUNTU: SAUCE: Fix compile error on arch/x86/lguest/boot.c IMPACT: Commit 434e71 'virtio: explicit advertisement of driver features' which add a new inline function virtio_has_feature() in include/linux/virtio_config.h causes compile failed when CONFIG_LGUEST_GUEST=y. In virtio_config.h:91, variable features in 'struct virtio_device' is called for test_bit. Without including linux/virtio.h in arch/x86/lguest/boot.c, when 'CC arch/x86/lguest/boot.c', compiler do not know what is 'struct virtio_device' and return with error. Ubuntu-hardy master branch do not affected because CONFIG_LGUEST_GUEST is not set. FIX: Upstream has the fix with change config from little-endian only to guest endian (commit 72e61e). Since netbook-lpia branch is little-endian only, adding header file for lguest seems a simpler and better solution. This patch is going to add '#include ' before virtio_console.h in arch/x86/lguest/boot.c TEST: Build successfully after this patch added. Signed-off-by: Ike Panhc --- arch/x86/lguest/boot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index d6b18e2..bc8e0df 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include