lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dock' into test

Browse Source 
Conflicts:
	drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-10-22 23:25:26 -04:00
parent 4538fad56e 0a918a9432
commit 47bf31adc5
12 changed files with 424 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/acpi/bus.c
View File

@@ -525,6 +525,19 @@ static int acpi_bus_check_scope(struct acpi_device *device)
return 0;
}
static BLOCKING_NOTIFIER_HEAD(acpi_bus_notify_list);
int register_acpi_bus_notifier(struct notifier_block *nb)
{
return blocking_notifier_chain_register(&acpi_bus_notify_list, nb);
}
EXPORT_SYMBOL_GPL(register_acpi_bus_notifier);
void unregister_acpi_bus_notifier(struct notifier_block *nb)
{
blocking_notifier_chain_unregister(&acpi_bus_notify_list, nb);
}
EXPORT_SYMBOL_GPL(unregister_acpi_bus_notifier);
/**
* acpi_bus_notify
* ---------------
@@ -535,6 +548,8 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
int result = 0;
struct acpi_device *device = NULL;
blocking_notifier_call_chain(&acpi_bus_notify_list,
type, (void *)handle);
if (acpi_bus_get_device(handle, &device))
return;