Merge branch 'misc' into release
This commit is contained in:
commit
be6066f34c
|
@ -1529,16 +1529,10 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
|
||||||
* if acpi_blacklisted() acpi_disabled = 1;
|
* if acpi_blacklisted() acpi_disabled = 1;
|
||||||
* acpi_irq_model=...
|
* acpi_irq_model=...
|
||||||
* ...
|
* ...
|
||||||
*
|
|
||||||
* return value: (currently ignored)
|
|
||||||
* 0: success
|
|
||||||
* !0: failure
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int __init acpi_boot_table_init(void)
|
void __init acpi_boot_table_init(void)
|
||||||
{
|
{
|
||||||
int error;
|
|
||||||
|
|
||||||
dmi_check_system(acpi_dmi_table);
|
dmi_check_system(acpi_dmi_table);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1546,15 +1540,14 @@ int __init acpi_boot_table_init(void)
|
||||||
* One exception: acpi=ht continues far enough to enumerate LAPICs
|
* One exception: acpi=ht continues far enough to enumerate LAPICs
|
||||||
*/
|
*/
|
||||||
if (acpi_disabled && !acpi_ht)
|
if (acpi_disabled && !acpi_ht)
|
||||||
return 1;
|
return;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the ACPI boot-time table parser.
|
* Initialize the ACPI boot-time table parser.
|
||||||
*/
|
*/
|
||||||
error = acpi_table_init();
|
if (acpi_table_init()) {
|
||||||
if (error) {
|
|
||||||
disable_acpi();
|
disable_acpi();
|
||||||
return error;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
|
acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
|
||||||
|
@ -1562,18 +1555,15 @@ int __init acpi_boot_table_init(void)
|
||||||
/*
|
/*
|
||||||
* blacklist may disable ACPI entirely
|
* blacklist may disable ACPI entirely
|
||||||
*/
|
*/
|
||||||
error = acpi_blacklisted();
|
if (acpi_blacklisted()) {
|
||||||
if (error) {
|
|
||||||
if (acpi_force) {
|
if (acpi_force) {
|
||||||
printk(KERN_WARNING PREFIX "acpi=force override\n");
|
printk(KERN_WARNING PREFIX "acpi=force override\n");
|
||||||
} else {
|
} else {
|
||||||
printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
|
printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
|
||||||
disable_acpi();
|
disable_acpi();
|
||||||
return error;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init early_acpi_boot_init(void)
|
int __init early_acpi_boot_init(void)
|
||||||
|
|
|
@ -56,7 +56,7 @@ ACPI_MODULE_NAME("pci_link");
|
||||||
static int acpi_pci_link_add(struct acpi_device *device);
|
static int acpi_pci_link_add(struct acpi_device *device);
|
||||||
static int acpi_pci_link_remove(struct acpi_device *device, int type);
|
static int acpi_pci_link_remove(struct acpi_device *device, int type);
|
||||||
|
|
||||||
static struct acpi_device_id link_device_ids[] = {
|
static const struct acpi_device_id link_device_ids[] = {
|
||||||
{"PNP0C0F", 0},
|
{"PNP0C0F", 0},
|
||||||
{"", 0},
|
{"", 0},
|
||||||
};
|
};
|
||||||
|
|
|
@ -46,7 +46,7 @@ static int acpi_pci_root_add(struct acpi_device *device);
|
||||||
static int acpi_pci_root_remove(struct acpi_device *device, int type);
|
static int acpi_pci_root_remove(struct acpi_device *device, int type);
|
||||||
static int acpi_pci_root_start(struct acpi_device *device);
|
static int acpi_pci_root_start(struct acpi_device *device);
|
||||||
|
|
||||||
static struct acpi_device_id root_device_ids[] = {
|
static const struct acpi_device_id root_device_ids[] = {
|
||||||
{"PNP0A03", 0},
|
{"PNP0A03", 0},
|
||||||
{"", 0},
|
{"", 0},
|
||||||
};
|
};
|
||||||
|
|
|
@ -65,7 +65,7 @@ static int acpi_power_remove(struct acpi_device *device, int type);
|
||||||
static int acpi_power_resume(struct acpi_device *device);
|
static int acpi_power_resume(struct acpi_device *device);
|
||||||
static int acpi_power_open_fs(struct inode *inode, struct file *file);
|
static int acpi_power_open_fs(struct inode *inode, struct file *file);
|
||||||
|
|
||||||
static struct acpi_device_id power_device_ids[] = {
|
static const struct acpi_device_id power_device_ids[] = {
|
||||||
{ACPI_POWER_HID, 0},
|
{ACPI_POWER_HID, 0},
|
||||||
{"", 0},
|
{"", 0},
|
||||||
};
|
};
|
||||||
|
|
|
@ -64,7 +64,7 @@ static int can_cap_in_hardware(void)
|
||||||
return force_cap_on || cap_in_hardware;
|
return force_cap_on || cap_in_hardware;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct acpi_device_id power_meter_ids[] = {
|
static const struct acpi_device_id power_meter_ids[] = {
|
||||||
{"ACPI000D", 0},
|
{"ACPI000D", 0},
|
||||||
{"", 0},
|
{"", 0},
|
||||||
};
|
};
|
||||||
|
@ -534,6 +534,7 @@ static void remove_domain_devices(struct acpi_power_meter_resource *resource)
|
||||||
|
|
||||||
kfree(resource->domain_devices);
|
kfree(resource->domain_devices);
|
||||||
kobject_put(resource->holders_dir);
|
kobject_put(resource->holders_dir);
|
||||||
|
resource->num_domain_devices = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int read_domain_devices(struct acpi_power_meter_resource *resource)
|
static int read_domain_devices(struct acpi_power_meter_resource *resource)
|
||||||
|
@ -740,7 +741,6 @@ skip_unsafe_cap:
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
error:
|
error:
|
||||||
remove_domain_devices(resource);
|
|
||||||
remove_attrs(resource);
|
remove_attrs(resource);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||||
return AE_OK;
|
return AE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_early_processor_set_pdc(void)
|
void __init acpi_early_processor_set_pdc(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Check whether the system is DMI table. If yes, OSPM
|
* Check whether the system is DMI table. If yes, OSPM
|
||||||
|
|
|
@ -443,8 +443,7 @@ struct thermal_cooling_device_ops processor_cooling_ops = {
|
||||||
#ifdef CONFIG_ACPI_PROCFS
|
#ifdef CONFIG_ACPI_PROCFS
|
||||||
static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
|
static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
|
||||||
{
|
{
|
||||||
struct acpi_processor *pr = (struct acpi_processor *)seq->private;
|
struct acpi_processor *pr = seq->private;
|
||||||
|
|
||||||
|
|
||||||
if (!pr)
|
if (!pr)
|
||||||
goto end;
|
goto end;
|
||||||
|
|
|
@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
|
||||||
|
|
||||||
static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
|
static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
|
||||||
{
|
{
|
||||||
|
#if defined(CONFIG_ACPI_SYSFS_POWER) || defined(CONFIG_ACPI_PROCFS_POWER)
|
||||||
struct acpi_battery *battery = &sbs->battery[id];
|
struct acpi_battery *battery = &sbs->battery[id];
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI_SYSFS_POWER
|
#ifdef CONFIG_ACPI_SYSFS_POWER
|
||||||
if (battery->bat.dev) {
|
if (battery->bat.dev) {
|
||||||
if (battery->have_sysfs_alarm)
|
if (battery->have_sysfs_alarm)
|
||||||
|
|
|
@ -1201,9 +1201,12 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)
|
||||||
/* the buffer is filled with magic numbers describing the devices
|
/* the buffer is filled with magic numbers describing the devices
|
||||||
* available, 0xff terminates the enumeration
|
* available, 0xff terminates the enumeration
|
||||||
*/
|
*/
|
||||||
while ((dev_code = *(device_enum->buffer.pointer + i)) != 0xff &&
|
for (i = 0; i < device_enum->buffer.length; i++) {
|
||||||
i < device_enum->buffer.length) {
|
|
||||||
i++;
|
dev_code = *(device_enum->buffer.pointer + i);
|
||||||
|
if (dev_code == 0xff)
|
||||||
|
break;
|
||||||
|
|
||||||
dprintk("Radio devices, looking at 0x%.2x\n", dev_code);
|
dprintk("Radio devices, looking at 0x%.2x\n", dev_code);
|
||||||
|
|
||||||
if (dev_code == 0 && !sony_rfkill_devices[SONY_WIFI])
|
if (dev_code == 0 && !sony_rfkill_devices[SONY_WIFI])
|
||||||
|
|
|
@ -80,7 +80,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
|
||||||
void __acpi_unmap_table(char *map, unsigned long size);
|
void __acpi_unmap_table(char *map, unsigned long size);
|
||||||
int early_acpi_boot_init(void);
|
int early_acpi_boot_init(void);
|
||||||
int acpi_boot_init (void);
|
int acpi_boot_init (void);
|
||||||
int acpi_boot_table_init (void);
|
void acpi_boot_table_init (void);
|
||||||
int acpi_mps_check (void);
|
int acpi_mps_check (void);
|
||||||
int acpi_numa_init (void);
|
int acpi_numa_init (void);
|
||||||
|
|
||||||
|
@ -321,9 +321,9 @@ static inline int acpi_boot_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int acpi_boot_table_init(void)
|
static inline void acpi_boot_table_init(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int acpi_mps_check(void)
|
static inline int acpi_mps_check(void)
|
||||||
|
|
Loading…
Reference in a new issue