Re: [PATCH V2 3/3] Update Linux loader to follow the kernel's preferences

[Keshav P R]

On Mon, Feb 6, 2012 at 22:10, Keshav P R <address@hidden> wrote:
> On Mon, Feb 6, 2012 at 22:08, Matthew Garrett <address@hidden> wrote:
>> On Mon, Feb 06, 2012 at 10:00:30PM +0530, Keshav P R wrote:
>>> loader/i386/pc/plan9_module-plan9.o `test -f 'loader/i386/pc/plan9.c'
>>> || echo './'`loader/i386/pc/plan9.c
>>> loader/i386/pc/plan9.c: In function 'grub_cmd_plan9':
>>> loader/i386/pc/plan9.c:420:9: error: too few arguments to function
>>> 'grub_relocator_alloc_chunk_addr'
>>> ../include/grub/relocator.h:34:1: note: declared here
>>> loader/i386/pc/plan9.c:451:9: error: too few arguments to function
>>> 'grub_relocator_alloc_chunk_addr'
>>> ../include/grub/relocator.h:34:1: note: declared here
>>> make[3]: *** [loader/i386/pc/plan9_module-plan9.o] Error 1
>>>
>>>
>>> with all the three V2 patches applied in order (didn't try V1). No
>>> error in x86_64-efi compile.
>>
>> Sigh. Sorry, I missed that the plan9 loader had been added. Just add a 0
>> as an additional argument to grub_relocator_alloc_chunk_addr() in
>> plan9.c.
>>
>
> Any other files that require this change?
>

After applying the patch, "git grep -n
grub_relocator_alloc_chunk_addr" shows, among them the to-be-changed
files (I think)

grub-core/loader/i386/coreboot/chainloader.c:71:  err =
grub_relocator_alloc_chunk_addr (relocator, &ch,
grub-core/loader/i386/pc/chainloader.c:168:    err =
grub_relocator_alloc_chunk_addr (rel, &ch, 0x7C00,
grub-core/loader/i386/pc/chainloader.c:173:    err =
grub_relocator_alloc_chunk_addr (rel, &ch,
grub-core/loader/i386/pc/plan9.c:419:    err =
grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_PLAN9_CONFIG_ADDR,
grub-core/loader/i386/pc/plan9.c:450:    err =
grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_PLAN9_TARGET,
grub-core/loader/i386/pc/pxechainloader.c:133:    err =
grub_relocator_alloc_chunk_addr (rel, &ch, 0x7c00, imagesize);


>> --
>> Matthew Garrett | address@hidden