| Message ID | 1456642686-18887-7-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 358bb3ff5bb3a412aa784e7d1a4d6faf2fc6c8ae |
| Delegated to: | Bin Meng |
| Headers | show |
On 27 February 2016 at 23:58, Bin Meng <bmeng.cn@gmail.com> wrote: > Change the parameter and return value of write_acpi_tables() to u32 > to conform with other table write routines. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/cpu/qemu/fw_cfg.c | 5 ++--- > arch/x86/include/asm/acpi_table.h | 2 +- > arch/x86/lib/acpi_table.c | 4 ++-- > 3 files changed, 5 insertions(+), 6 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Feb 29, 2016 at 12:19 PM, Simon Glass <sjg@chromium.org> wrote: > On 27 February 2016 at 23:58, Bin Meng <bmeng.cn@gmail.com> wrote: >> Change the parameter and return value of write_acpi_tables() to u32 >> to conform with other table write routines. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/cpu/qemu/fw_cfg.c | 5 ++--- >> arch/x86/include/asm/acpi_table.h | 2 +- >> arch/x86/lib/acpi_table.c | 4 ++-- >> 3 files changed, 5 insertions(+), 6 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/cpu/qemu/fw_cfg.c b/arch/x86/cpu/qemu/fw_cfg.c index 5ea7a6e..a0a3d08 100644 --- a/arch/x86/cpu/qemu/fw_cfg.c +++ b/arch/x86/cpu/qemu/fw_cfg.c @@ -232,8 +232,7 @@ static struct fw_file *qemu_fwcfg_find_file(const char *name) * be ignored. * @return: 0 on success, or negative value on failure */ -static int bios_linker_allocate(struct bios_linker_entry *entry, - unsigned long *addr) +static int bios_linker_allocate(struct bios_linker_entry *entry, u32 *addr) { uint32_t size, align; struct fw_file *file; @@ -383,7 +382,7 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries) } /* This function loads and patches ACPI tables provided by QEMU */ -unsigned long write_acpi_tables(unsigned long addr) +u32 write_acpi_tables(u32 addr) { int i, ret = 0; struct fw_file *file; diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 0853248..9856fa6 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -390,4 +390,4 @@ void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, void *dsdt); int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u8 cpu, u16 flags, u8 lint); -unsigned long write_acpi_tables(unsigned long start); +u32 write_acpi_tables(u32 start); diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 2ec5ad2..790f6fb 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -335,9 +335,9 @@ static void acpi_create_ssdt_generator(acpi_header_t *ssdt, * QEMU's version of write_acpi_tables is defined in * arch/x86/cpu/qemu/fw_cfg.c */ -unsigned long write_acpi_tables(unsigned long start) +u32 write_acpi_tables(u32 start) { - unsigned long current; + u32 current; struct acpi_rsdp *rsdp; struct acpi_rsdt *rsdt; struct acpi_xsdt *xsdt;
Change the parameter and return value of write_acpi_tables() to u32 to conform with other table write routines. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/cpu/qemu/fw_cfg.c | 5 ++--- arch/x86/include/asm/acpi_table.h | 2 +- arch/x86/lib/acpi_table.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-)