View | Details | Raw Unified | Return to bug 200011 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/acpi/bus.c (-8 / +7 lines)
Lines 1054-1067 void __init acpi_early_init(void) Link Here
1054
		goto error0;
1054
		goto error0;
1055
	}
1055
	}
1056
1056
1057
	if (!acpi_gbl_execute_tables_as_methods &&
1057
	status = acpi_load_tables();
1058
	    acpi_gbl_group_module_level_code) {
1058
	if (ACPI_FAILURE(status)) {
1059
		status = acpi_load_tables();
1059
		printk(KERN_ERR PREFIX
1060
		if (ACPI_FAILURE(status)) {
1060
			"Unable to load the System Description Tables\n");
1061
			printk(KERN_ERR PREFIX
1061
		goto error0;
1062
			       "Unable to load the System Description Tables\n");
1063
			goto error0;
1064
		}
1065
	}
1062
	}
1066
1063
1067
#ifdef CONFIG_X86
1064
#ifdef CONFIG_X86
Lines 1144-1149 static int __init acpi_bus_init(void) Link Here
1144
	status = acpi_ec_ecdt_probe();
1141
	status = acpi_ec_ecdt_probe();
1145
	/* Ignore result. Not having an ECDT is not fatal. */
1142
	/* Ignore result. Not having an ECDT is not fatal. */
1146
1143
1144
/*
1147
	if (acpi_gbl_execute_tables_as_methods ||
1145
	if (acpi_gbl_execute_tables_as_methods ||
1148
	    !acpi_gbl_group_module_level_code) {
1146
	    !acpi_gbl_group_module_level_code) {
1149
		status = acpi_load_tables();
1147
		status = acpi_load_tables();
Lines 1153-1158 static int __init acpi_bus_init(void) Link Here
1153
			goto error1;
1151
			goto error1;
1154
		}
1152
		}
1155
	}
1153
	}
1154
*/
1156
1155
1157
	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
1156
	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
1158
	if (ACPI_FAILURE(status)) {
1157
	if (ACPI_FAILURE(status)) {

Return to bug 200011