On Fri, 02 Aug, at 02:29:03PM, Roy Franz wrote: > No code changes made, just moving functions from x86 arch directory > to common location. > Code is shared using #include, similar to how decompression code > is shared among architectures. > > Signed-off-by: Roy Franz <roy.franz@xxxxxxxxxx> > --- > arch/x86/boot/compressed/eboot.c | 442 +----------------------------- > arch/x86/boot/compressed/eboot.h | 6 - > drivers/firmware/efi/efi-stub-helper.c | 463 ++++++++++++++++++++++++++++++++ > include/linux/efi.h | 8 + > 4 files changed, 472 insertions(+), 447 deletions(-) > create mode 100644 drivers/firmware/efi/efi-stub-helper.c [...] > diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c > new file mode 100644 > index 0000000..47891bd > --- /dev/null > +++ b/drivers/firmware/efi/efi-stub-helper.c > @@ -0,0 +1,463 @@ > +/* > + * Helper functions used by the EFI stub on multiple > + * architectures. This should be #included by the EFI stub > + * implementation files. > + * > + * Copyright 2011 Intel Corporation; author Matt Fleming > + * > + * This file is part of the Linux kernel, and is made available > + * under the terms of the GNU General Public License version 2. > + * > + */ > + > + > +struct initrd { > + efi_file_handle_t *handle; > + u64 size; > +}; This should really be renamed in a later patch, like 'struct efi_file' or similar because the dtb case has nothing to do with initrds. > +/* > + * Check the cmdline for a LILO-style initrd= arguments. > + * > + * We only support loading an initrd from the same filesystem as the > + * kernel image. > + */ > +static efi_status_t handle_ramdisks(efi_loaded_image_t *image, > + struct setup_header *hdr) > +{ > + struct initrd *initrds; [...] > +free_initrds: > + efi_call_phys1(sys_table->boottime->free_pool, initrds); > +fail: > + hdr->ramdisk_image = 0; > + hdr->ramdisk_size = 0; > + > + return status; > +} Likewise, this function would benefit from getting rid of the references to initrd in a later patch. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html