[PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[Scott Wood]

Fix an unresolved symbol with CONFIG_KVM_GUEST plus CONFIG_RELOCATABLE on
Book E.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
 arch/powerpc/kernel/kvm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c
index 428d0e5..b06bdae 100644
--- a/arch/powerpc/kernel/kvm.c
+++ b/arch/powerpc/kernel/kvm.c
@@ -127,7 +127,7 @@ static void kvm_patch_ins_nop(u32 *inst)
 
 static void kvm_patch_ins_b(u32 *inst, int addr)
 {
-#ifdef CONFIG_RELOCATABLE
+#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC_BOOK3S)
 	/* On relocatable kernels interrupts handlers and our code
 	   can be in different regions, so we don't patch them */
 
-- 
1.7.0.4

Re: [PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[Alexander Graf]

On 19.10.2010, at 00:35, Scott Wood wrote:

> Fix an unresolved symbol with CONFIG_KVM_GUEST plus CONFIG_RELOCATABLE on
> Book E.

Thanks, applied to the kvm-ppc-next tree.

Avi, could you please pull my tree asap? That breakage is pretty bad and all my fault :(. It might be good if we could have a stable update for that particular patch as well. Should I add a stable tag in the patch description for that?


Alex


The following changes since commit cec8b6b972a572b69d4902f57fb659e8a4c749af:
  Avi Kivity (1):
        Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into next

are available in the git repository at:

  git://github.com/agraf/linux-2.6.git kvm-ppc-next

Scott Wood (1):
      PPC: KVM: Book E doesn't have __end_interrupts.

 arch/powerpc/kernel/kvm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Re: [PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[Marcelo Tosatti]

On Tue, Oct 19, 2010 at 12:57:29AM +0200, Alexander Graf wrote:
> 
> On 19.10.2010, at 00:35, Scott Wood wrote:
> 
> > Fix an unresolved symbol with CONFIG_KVM_GUEST plus CONFIG_RELOCATABLE on
> > Book E.
> 
> Thanks, applied to the kvm-ppc-next tree.
> 
> Avi, could you please pull my tree asap? That breakage is pretty bad
> and all my fault :(. 

Done.

> It might be good if we could have a stable update
> for that particular patch as well. Should I add a stable tag in the
> patch description for that?

Please do it yourself (active trees are 2.6.35 and 2.6.32), since we
have no way to test it. Wait for it to be merged in linux-2.6.git,
then send the patch (specifying which kernel it applies to) to
stable@kernel.org. 

Ah, there is no need to backport it, the code is not in linux-2.6.git.

Re: [PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[Alexander Graf]

Am 19.10.2010 um 16:06 schrieb Marcelo Tosatti <mtosatti@redhat.com>:

> On Tue, Oct 19, 2010 at 12:57:29AM +0200, Alexander Graf wrote:
>> 
>> On 19.10.2010, at 00:35, Scott Wood wrote:
>> 
>>> Fix an unresolved symbol with CONFIG_KVM_GUEST plus CONFIG_RELOCATABLE on
>>> Book E.
>> 
>> Thanks, applied to the kvm-ppc-next tree.
>> 
>> Avi, could you please pull my tree asap? That breakage is pretty bad
>> and all my fault :(. 
> 
> Done.


Thanks :).

> 
>> It might be good if we could have a stable update
>> for that particular patch as well. Should I add a stable tag in the
>> patch description for that?
> 
> Please do it yourself (active trees are 2.6.35 and 2.6.32), since we

Ah, thanks for the hint there. So I'll manage stable parts for kvm-ppc myself and do not go through your stable queue in general? Sounds good to me, just want to verify.

> have no way to test it. Wait for it to be merged in linux-2.6.git,
> then send the patch (specifying which kernel it applies to) to
> stable@kernel.org. 
> 
> Ah, there is no need to backport it, the code is not in linux-2.6.git.

It didn't make it there yet? Interesting. Seems like pretty long delays between kvm.git and linux-2.6.git then. That code is months old :). That makes this matter a lot easier though. Thanks for checking before I emberass myself :).

Alex

Re: [PATCH] PPC: KVM: Book E doesn't have __end_interrupts.

[Avi Kivity]

  On 10/19/2010 05:26 PM, Alexander Graf wrote:
>
>> have no way to test it. Wait for it to be merged in linux-2.6.git,
>> then send the patch (specifying which kernel it applies to) to
>> stable@kernel.org.
>>
>> Ah, there is no need to backport it, the code is not in linux-2.6.git.
> It didn't make it there yet? Interesting. Seems like pretty long delays between kvm.git and linux-2.6.git then. That code is months old :). That makes this matter a lot easier though. Thanks for checking before I emberass myself :).
>

Patches merged to kvm.git await the next merge window, so up to a three 
months delay.  Security and recent regression fixes go straight in.