Pull trivial into test branch
This commit is contained in:
commit
9aaed2b42d
|
@ -48,6 +48,12 @@ ACPI_MODULE_NAME("acpi_motherboard")
|
|||
* the io ports if they really know they can use it, while
|
||||
* still preventing hotplug PCI devices from using it.
|
||||
*/
|
||||
|
||||
/*
|
||||
* When CONFIG_PNP is enabled, pnp/system.c binds to PNP0C01
|
||||
* and PNP0C02, redundant with acpi_reserve_io_ranges().
|
||||
* But acpi_reserve_io_ranges() is necessary for !CONFIG_PNP.
|
||||
*/
|
||||
static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
|
||||
{
|
||||
struct resource *requested_res = NULL;
|
||||
|
|
|
@ -307,7 +307,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
|
|||
if (!link || !irq)
|
||||
return -EINVAL;
|
||||
|
||||
resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);
|
||||
resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
|
||||
if (!resource)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -216,10 +216,8 @@ static int acpi_power_off_device(acpi_handle handle)
|
|||
{
|
||||
int result = 0;
|
||||
acpi_status status = AE_OK;
|
||||
struct acpi_device *device = NULL;
|
||||
struct acpi_power_resource *resource = NULL;
|
||||
|
||||
|
||||
result = acpi_power_get_context(handle, &resource);
|
||||
if (result)
|
||||
return result;
|
||||
|
@ -230,13 +228,13 @@ static int acpi_power_off_device(acpi_handle handle)
|
|||
if (resource->references) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||
"Resource [%s] is still in use, dereferencing\n",
|
||||
device->pnp.bus_id));
|
||||
resource->device->pnp.bus_id));
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (resource->state == ACPI_POWER_RESOURCE_STATE_OFF) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",
|
||||
device->pnp.bus_id));
|
||||
resource->device->pnp.bus_id));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -251,8 +249,7 @@ static int acpi_power_off_device(acpi_handle handle)
|
|||
return -ENOEXEC;
|
||||
|
||||
/* Update the power resource's _device_ power state */
|
||||
device = resource->device;
|
||||
device->power.state = ACPI_STATE_D3;
|
||||
resource->device->power.state = ACPI_STATE_D3;
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n",
|
||||
resource->name));
|
||||
|
|
|
@ -519,7 +519,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
|||
|
||||
static void *processor_device_array[NR_CPUS];
|
||||
|
||||
static int acpi_processor_start(struct acpi_device *device)
|
||||
static int __cpuinit acpi_processor_start(struct acpi_device *device)
|
||||
{
|
||||
int result = 0;
|
||||
acpi_status status = AE_OK;
|
||||
|
|
|
@ -1130,7 +1130,7 @@ static struct notifier_block acpi_processor_latency_notifier = {
|
|||
.notifier_call = acpi_processor_latency_notify,
|
||||
};
|
||||
|
||||
int acpi_processor_power_init(struct acpi_processor *pr,
|
||||
int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
|
||||
struct acpi_device *device)
|
||||
{
|
||||
acpi_status status = 0;
|
||||
|
|
|
@ -324,7 +324,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
|
|||
|
||||
if (header->length < sizeof(struct acpi_table_header)) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Table length (%X) is smaller than minimum (%X)",
|
||||
"Table length (%X) is smaller than minimum (%zX)",
|
||||
header->length, sizeof(struct acpi_table_header)));
|
||||
|
||||
return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
|
||||
|
|
|
@ -187,7 +187,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
|
|||
|
||||
if (table_ptr->length < sizeof(struct acpi_table_header)) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"RSDT/XSDT length (%X) is smaller than minimum (%X)",
|
||||
"RSDT/XSDT length (%X) is smaller than minimum (%zX)",
|
||||
table_ptr->length,
|
||||
sizeof(struct acpi_table_header)));
|
||||
|
||||
|
|
Loading…
Reference in a new issue