V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

x86: Change write_acpi_tables() signature a little bit 

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2016-02-27 22:58:00 -08:00
parent 897e1dc86a
commit 358bb3ff5b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/cpu/qemu/fw_cfg.c
View File

@ -232,8 +232,7 @@ static struct fw_file *qemu_fwcfg_find_file(const char *name)
* be ignored. * be ignored.
* @return: 0 on success, or negative value on failure * @return: 0 on success, or negative value on failure
*/ */
static int bios_linker_allocate(struct bios_linker_entry *entry, static int bios_linker_allocate(struct bios_linker_entry *entry, u32 *addr)
unsigned long *addr)
{ {
uint32_t size, align; uint32_t size, align;
struct fw_file *file; 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 */ /* 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; int i, ret = 0;
struct fw_file *file; struct fw_file *file;

2
arch/x86/include/asm/acpi_table.h
View File

@ -390,4 +390,4 @@ void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
void *dsdt); void *dsdt);
int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u8 cpu, int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u8 cpu,
u16 flags, u8 lint); u16 flags, u8 lint);
unsigned long write_acpi_tables(unsigned long start); u32 write_acpi_tables(u32 start);

4
arch/x86/lib/acpi_table.c
View File

@ -335,9 +335,9 @@ static void acpi_create_ssdt_generator(acpi_header_t *ssdt,
* QEMU's version of write_acpi_tables is defined in * QEMU's version of write_acpi_tables is defined in
* arch/x86/cpu/qemu/fw_cfg.c * 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_rsdp *rsdp;
struct acpi_rsdt *rsdt; struct acpi_rsdt *rsdt;
struct acpi_xsdt *xsdt; struct acpi_xsdt *xsdt;