Message ID | 1276072551-19182-1-git-send-email-ike.pan@canonical.com |
---|---|
State | Not Applicable |
Delegated to: | Stefan Bader |
Headers | show |
Sorry for sent an empty subject mail. Fix it with this one. On 06/09/2010 04:35 PM, Ike Panhc wrote: > 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 <ike.pan@canonical.com> > 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 <linux/virtio.h>' before virtio_console.h in arch/x86/lguest/boot.c > > TEST: > > Build successfully after this patch added. > > Signed-off-by: Ike Panhc <ike.pan@canonical.com> > --- > 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 <linux/clockchips.h> > #include <linux/lguest.h> > #include <linux/lguest_launcher.h> > +#include <linux/virtio.h> > #include <linux/virtio_console.h> > #include <linux/pm.h> > #include <asm/paravirt.h>
On Wed, Jun 9, 2010 at 4:35 PM, Ike Panhc <ike.pan@canonical.com> wrote: > 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. > Simple enough and green light on this. Yet I'm wondering if the upstream version is simple enough as well, so that we don't need to maintain two fixes to a same issue? > > ======== 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 <ike.pan@canonical.com> > 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 <linux/virtio.h>' before virtio_console.h in arch/x86/lguest/boot.c > > TEST: > > Build successfully after this patch added. > > Signed-off-by: Ike Panhc <ike.pan@canonical.com> > --- > 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 <linux/clockchips.h> > #include <linux/lguest.h> > #include <linux/lguest_launcher.h> > +#include <linux/virtio.h> > #include <linux/virtio_console.h> > #include <linux/pm.h> > #include <asm/paravirt.h> > -- > 1.7.0.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team >
On 06/09/2010 04:51 PM, Eric Miao wrote: > On Wed, Jun 9, 2010 at 4:35 PM, Ike Panhc <ike.pan@canonical.com> wrote: >> 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. >> > > Simple enough and green light on this. Yet I'm wondering if the > upstream version is simple enough as well, so that we don't need > to maintain two fixes to a same issue? The upstream fix (comment 72e61eb40b55dd57031ec5971e810649f82b0259 upstream) is 21 lines added and 36 lines removed. I think it is not a small patch.
On Wed, Jun 09, 2010 at 04:45:13PM +0800, Ike Panhc wrote: > Sorry for sent an empty subject mail. Fix it with this one. > > On 06/09/2010 04:35 PM, Ike Panhc wrote: > > 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. So we know why LGUEST_GUEST is even set on the netbook branch, this does not sound like something we really would have turned on deliberatly to me ? -apw
The change looks simple enough. OTOH it feels strange to do this in generic architectural code for lpia. I would think that if we did not set that option in the default i386 configuration and there is no known need for it by netbook-lpia/lpia we probably just should unset that option. -Stefan On 06/09/2010 10:45 AM, Ike Panhc wrote: > Sorry for sent an empty subject mail. Fix it with this one. > > On 06/09/2010 04:35 PM, Ike Panhc wrote: >> 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 <ike.pan@canonical.com> >> 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 <linux/virtio.h>' before virtio_console.h in arch/x86/lguest/boot.c >> >> TEST: >> >> Build successfully after this patch added. >> >> Signed-off-by: Ike Panhc <ike.pan@canonical.com> >> --- >> 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 <linux/clockchips.h> >> #include <linux/lguest.h> >> #include <linux/lguest_launcher.h> >> +#include <linux/virtio.h> >> #include <linux/virtio_console.h> >> #include <linux/pm.h> >> #include <asm/paravirt.h> > >
======== 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 <ike.pan@canonical.com> 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 <linux/virtio.h>' before virtio_console.h in arch/x86/lguest/boot.c TEST: Build successfully after this patch added. Signed-off-by: Ike Panhc <ike.pan@canonical.com> --- 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 <linux/clockchips.h> #include <linux/lguest.h> #include <linux/lguest_launcher.h> +#include <linux/virtio.h> #include <linux/virtio_console.h> #include <linux/pm.h> #include <asm/paravirt.h>