Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3899c66 authored by Len Brown's avatar Len Brown
Browse files

Pull acpica into release branch

parents 553698f9 4c90ece2

arch/i386/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -621,9 +621,9 @@ extern u32 pmtmr_ioport; 


static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)

{

	struct fadt_descriptor_rev2 *fadt = NULL;

	struct fadt_descriptor *fadt = NULL;



	fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);

	fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);

	if (!fadt) {

		printk(KERN_WARNING PREFIX "Unable to map FADT\n");

		return 0;

arch/ia64/hp/common/sba_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ acpi_sba_ioc_add(struct acpi_device *device) 
		if (!iovp_shift)

			iovp_shift = min(PAGE_SHIFT, 16);

	}

	ACPI_MEM_FREE(dev_info);

	kfree(dev_info);



	/*

	 * default anything not caught above or specified on cmdline to 4k

drivers/acpi/asus_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static int __init asus_hotk_get_info(void) 
	 * HID), this bit will be moved. A global variable asus_info contains

	 * the DSDT header.

	 */

	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt);

	status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt);

	if (ACPI_FAILURE(status))

		printk(KERN_WARNING "  Couldn't get the DSDT table header\n");

	else

drivers/acpi/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ ACPI_MODULE_NAME("acpi_bus") 
extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);

#endif



FADT_DESCRIPTOR acpi_fadt;

struct fadt_descriptor acpi_fadt;

EXPORT_SYMBOL(acpi_fadt);



struct acpi_device *acpi_root;
@@ -596,6 +596,8 @@ void __init acpi_early_init(void) 
	if (acpi_disabled)

		return_VOID;



	printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);



	/* enable workarounds, unless strict ACPI spec. compliance */

	if (!acpi_strict)

		acpi_gbl_enable_interpreter_slack = TRUE;
@@ -617,7 +619,7 @@ void __init acpi_early_init(void) 
	/*

	 * Get a separate copy of the FADT for use by other drivers.

	 */

	status = acpi_get_table(ACPI_TABLE_FADT, 1, &buffer);

	status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &buffer);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX "Unable to get the FADT\n");

		goto error0;
@@ -743,8 +745,6 @@ static int __init acpi_init(void) 


	ACPI_FUNCTION_TRACE("acpi_init");



	printk(KERN_INFO PREFIX "Subsystem revision %08x\n", ACPI_CA_VERSION);



	if (acpi_disabled) {

		printk(KERN_INFO PREFIX "Interpreter disabled.\n");

		return_VALUE(-ENODEV);

drivers/acpi/dispatcher/dsfield.c

+7 −6
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op, 
	union acpi_operand_object *second_desc = NULL;

	u32 flags;



	ACPI_FUNCTION_TRACE("ds_create_buffer_field");

	ACPI_FUNCTION_TRACE(ds_create_buffer_field);



	/* Get the name_string argument */
@@ -210,7 +210,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, 
	acpi_status status;

	acpi_integer position;



	ACPI_FUNCTION_TRACE_PTR("ds_get_field_names", info);

	ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);



	/* First field starts at bit zero */
@@ -342,7 +342,7 @@ acpi_ds_create_field(union acpi_parse_object *op, 
	union acpi_parse_object *arg;

	struct acpi_create_field_info info;



	ACPI_FUNCTION_TRACE_PTR("ds_create_field", op);

	ACPI_FUNCTION_TRACE_PTR(ds_create_field, op);



	/* First arg is the name of the parent op_region (must already exist) */
@@ -399,7 +399,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, 
	struct acpi_namespace_node *node;

	u8 type = 0;



	ACPI_FUNCTION_TRACE_PTR("ds_init_field_objects", op);

	ACPI_FUNCTION_TRACE_PTR(ds_init_field_objects, op);



	switch (walk_state->opcode) {

	case AML_FIELD_OP:
@@ -425,6 +425,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op, 
	 * Walk the list of entries in the field_list

	 */

	while (arg) {



		/* Ignore OFFSET and ACCESSAS terms here */



		if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
@@ -481,7 +482,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op, 
	union acpi_parse_object *arg;

	struct acpi_create_field_info info;



	ACPI_FUNCTION_TRACE_PTR("ds_create_bank_field", op);

	ACPI_FUNCTION_TRACE_PTR(ds_create_bank_field, op);



	/* First arg is the name of the parent op_region (must already exist) */
@@ -554,7 +555,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op, 
	union acpi_parse_object *arg;

	struct acpi_create_field_info info;



	ACPI_FUNCTION_TRACE_PTR("ds_create_index_field", op);

	ACPI_FUNCTION_TRACE_PTR(ds_create_index_field, op);



	/* First arg is the name of the Index register (must already exist) */