linux-pm bleeding-edge build failure

Hi Rafael,

Building the latest bleeding edge (4881a46e969889ba1c20fed733e742bf19d0591e), I get this error:

drivers/acpi/acpica/tbfadt.c: In function ‘acpi_tb_convert_fadt’:
drivers/acpi/acpica/tbfadt.c:493:12: error: too few arguments to function ‘acpi_tb_init_generic_address’

            fadt_info_table[i].name);
            ^

drivers/acpi/acpica/tbfadt.c:190:1: note: declared here
acpi_tb_init_generic_address(struct acpi_generic_address *generic_address, ^
drivers/acpi/acpica/tbfadt.c:394:5: warning: unused variable ‘flags’ [-Wunused-variable]

  u8 flags;
     ^
drivers/acpi/acpica/tbfadt.c:393:5: warning: unused variable ‘length’ [-Wunused-variable]
  u8 length;
     ^

drivers/acpi/acpica/tbfadt.c: In function ‘acpi_tb_validate_fadt’:
drivers/acpi/acpica/tbfadt.c:572:3: error: ‘flags’ undeclared (first use in this function)
flags = fadt_info_table[i].flags;
^
drivers/acpi/acpica/tbfadt.c:572:3: note: each undeclared identifier is reported only once for each function it appears in drivers/acpi/acpica/tbfadt.c:599:7: error: ‘address32’ undeclared (first use in this function)

   if (address32) {
       ^

make[3]: *** [drivers/acpi/acpica/tbfadt.o] Error 1 make[2]: *** [drivers/acpi/acpica] Error 2 make[1]: *** [drivers/acpi] Error 2
make: *** [drivers] Error 2
make: *** Waiting for unfinished jobs....

Thanks,
Stratos

That's because of my merge conflict resolution that went wrong.

I guess I'll need to drop one commit from acpica-next.

Thanks!

I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.