[OpenBIOS] [commit] r969 - in trunk/openbios-devel/arch: ppc/qemu ppc64/qemu

[Andreas Färber]

Am 27.11.2010 um 20:02 schrieb Blue Swirl:

> On Sat, Nov 27, 2010 at 6:42 PM, Andreas Färber <andreas.faerber at web.de 
> > wrote:
>> Am 27.11.2010 um 16:03 schrieb Blue Swirl:
>>
>>> diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S
>>> index 4b6df3f..8439542 100644
>>> --- a/arch/ppc/qemu/start.S
>>> +++ b/arch/ppc/qemu/start.S

>>> @@ -453,7 +452,7 @@ GLOBL(_entry):
>>> #endif
>>>
>>>       bl      BRANCH_LABEL(setup_mmu)
>>> -       bl      BRANCH_LABEL(entry)
>>> +        bl      BRANCH_LABEL(_entry)
>>
>> Nack, infinite recursion. Original code is right, unless .entry  
>> gets hidden
>> by the compiler somehow. If the latter, we need to dereference the  
>> function
>> descriptor instead and do a bctrl.
>
> But then there would be a link time conflict with entry() in
> arch/ppc/qemu/init.c.

This is in fact supposed to branch to that entry(). :)

Please post the conflict you get.

Andreas