| Message ID | 1376090777-20090-11-git-send-email-roy.franz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2013-08-09 at 16:26 -0700, Roy Franz wrote: > This #define is only used the the shared code, so move > it there. > > Signed-off-by: Roy Franz <roy.franz@linaro.org> > --- Tested on arm64. Acked-by: Mark Salter <msalter@redhat.com>
On Fri, 9 Aug 2013 16:26:11 -0700, Roy Franz <roy.franz@linaro.org> wrote: > This #define is only used the the shared code, so move > it there. > > Signed-off-by: Roy Franz <roy.franz@linaro.org> Can this be squashed into patch 1? g. > --- > arch/x86/boot/compressed/eboot.h | 1 - > drivers/firmware/efi/efi-stub-helper.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h > index faa0bdf..bafbd94 100644 > --- a/arch/x86/boot/compressed/eboot.h > +++ b/arch/x86/boot/compressed/eboot.h > @@ -12,7 +12,6 @@ > #define DESC_TYPE_CODE_DATA (1 << 0) > > #define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) > -#define EFI_READ_CHUNK_SIZE (1024 * 1024) > > #define EFI_CONSOLE_OUT_DEVICE_GUID \ > EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \ > diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c > index 0f4d6e6..b707a9f 100644 > --- a/drivers/firmware/efi/efi-stub-helper.c > +++ b/drivers/firmware/efi/efi-stub-helper.c > @@ -9,7 +9,7 @@ > * under the terms of the GNU General Public License version 2. > * > */ > - > +#define EFI_READ_CHUNK_SIZE (1024 * 1024) > > struct file_info { > efi_file_handle_t *handle; > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
On Fri, Aug 30, 2013 at 6:33 AM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Fri, 9 Aug 2013 16:26:11 -0700, Roy Franz <roy.franz@linaro.org> wrote: >> This #define is only used the the shared code, so move >> it there. >> >> Signed-off-by: Roy Franz <roy.franz@linaro.org> > > Can this be squashed into patch 1? Yes, that makes sense. > > g. > >> --- >> arch/x86/boot/compressed/eboot.h | 1 - >> drivers/firmware/efi/efi-stub-helper.c | 2 +- >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h >> index faa0bdf..bafbd94 100644 >> --- a/arch/x86/boot/compressed/eboot.h >> +++ b/arch/x86/boot/compressed/eboot.h >> @@ -12,7 +12,6 @@ >> #define DESC_TYPE_CODE_DATA (1 << 0) >> >> #define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) >> -#define EFI_READ_CHUNK_SIZE (1024 * 1024) >> >> #define EFI_CONSOLE_OUT_DEVICE_GUID \ >> EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \ >> diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c >> index 0f4d6e6..b707a9f 100644 >> --- a/drivers/firmware/efi/efi-stub-helper.c >> +++ b/drivers/firmware/efi/efi-stub-helper.c >> @@ -9,7 +9,7 @@ >> * under the terms of the GNU General Public License version 2. >> * >> */ >> - >> +#define EFI_READ_CHUNK_SIZE (1024 * 1024) >> >> struct file_info { >> efi_file_handle_t *handle; >> -- >> 1.7.10.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >
diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h index faa0bdf..bafbd94 100644 --- a/arch/x86/boot/compressed/eboot.h +++ b/arch/x86/boot/compressed/eboot.h @@ -12,7 +12,6 @@ #define DESC_TYPE_CODE_DATA (1 << 0) #define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) -#define EFI_READ_CHUNK_SIZE (1024 * 1024) #define EFI_CONSOLE_OUT_DEVICE_GUID \ EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \ diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c index 0f4d6e6..b707a9f 100644 --- a/drivers/firmware/efi/efi-stub-helper.c +++ b/drivers/firmware/efi/efi-stub-helper.c @@ -9,7 +9,7 @@ * under the terms of the GNU General Public License version 2. * */ - +#define EFI_READ_CHUNK_SIZE (1024 * 1024) struct file_info { efi_file_handle_t *handle;
This #define is only used the the shared code, so move it there. Signed-off-by: Roy Franz <roy.franz@linaro.org> --- arch/x86/boot/compressed/eboot.h | 1 - drivers/firmware/efi/efi-stub-helper.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)