evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pull fluff into release branch

Browse source 
Conflicts:

	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2007-11-20 01:21:47 -05:00
commit e6532b8883
5 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/kernel/acpi/sleep_64.c
View file

@ -115,6 +115,3 @@ static int __init acpi_sleep_setup(char *str)
__setup("acpi_sleep=", acpi_sleep_setup); __setup("acpi_sleep=", acpi_sleep_setup);
void acpi_pci_link_exit(void)
{
}

2
arch/x86/pci/acpi.c
View file

@ -13,7 +13,7 @@ static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
return 0; return 0;
} }
static struct dmi_system_id acpi_pciprobe_dmi_table[] = { static struct dmi_system_id acpi_pciprobe_dmi_table[] __devinitdata = {
/* /*
* Systems where PCI IO resource ISA alignment can be skipped * Systems where PCI IO resource ISA alignment can be skipped
* when the ISA enable bit in the bridge control is not set * when the ISA enable bit in the bridge control is not set

4
drivers/acpi/ec.c
View file

@ -180,12 +180,12 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
if (acpi_ec_check_status(ec, event)) { if (acpi_ec_check_status(ec, event)) {
if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) { if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {
/* miss address GPE, don't expect it anymore */ /* miss address GPE, don't expect it anymore */
printk(KERN_INFO PREFIX "missing address confirmation," printk(KERN_INFO PREFIX "missing address confirmation, "
"don't expect it any longer.\n"); "don't expect it any longer.\n");
set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags); set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags);
} else { } else {
/* missing GPEs, switch back to poll mode */ /* missing GPEs, switch back to poll mode */
printk(KERN_INFO PREFIX "missing confirmations," printk(KERN_INFO PREFIX "missing confirmations, "
"switch off interrupt mode.\n"); "switch off interrupt mode.\n");
clear_bit(EC_FLAGS_GPE_MODE, &ec->flags); clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
} }

2
drivers/acpi/processor_core.c
View file

@ -641,7 +641,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
*/ */
if (processor_device_array[pr->id] != NULL && if (processor_device_array[pr->id] != NULL &&
processor_device_array[pr->id] != device) { processor_device_array[pr->id] != device) {
printk(KERN_WARNING "BIOS reported wrong ACPI id" printk(KERN_WARNING "BIOS reported wrong ACPI id "
"for the processor\n"); "for the processor\n");
return -ENODEV; return -ENODEV;
} }

2
drivers/acpi/tables/tbutils.c
View file

@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
/* XSDT has NULL entry, RSDT is used */ /* XSDT has NULL entry, RSDT is used */
address = rsdt_address; address = rsdt_address;
table_entry_size = sizeof(u32); table_entry_size = sizeof(u32);
ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry," ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
"using RSDT")); "using RSDT"));
} }
} }