Merge ../linux-2.6
This commit is contained in:
@@ -95,16 +95,16 @@ static struct device_node *derive_parent(const char *path)
|
||||
return parent;
|
||||
}
|
||||
|
||||
static struct notifier_block *pSeries_reconfig_chain;
|
||||
static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
|
||||
|
||||
int pSeries_reconfig_notifier_register(struct notifier_block *nb)
|
||||
{
|
||||
return notifier_chain_register(&pSeries_reconfig_chain, nb);
|
||||
return blocking_notifier_chain_register(&pSeries_reconfig_chain, nb);
|
||||
}
|
||||
|
||||
void pSeries_reconfig_notifier_unregister(struct notifier_block *nb)
|
||||
{
|
||||
notifier_chain_unregister(&pSeries_reconfig_chain, nb);
|
||||
blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb);
|
||||
}
|
||||
|
||||
static int pSeries_reconfig_add_node(const char *path, struct property *proplist)
|
||||
@@ -132,7 +132,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
err = notifier_call_chain(&pSeries_reconfig_chain,
|
||||
err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
|
||||
PSERIES_RECONFIG_ADD, np);
|
||||
if (err == NOTIFY_BAD) {
|
||||
printk(KERN_ERR "Failed to add device node %s\n", path);
|
||||
@@ -172,7 +172,7 @@ static int pSeries_reconfig_remove_node(struct device_node *np)
|
||||
|
||||
remove_node_proc_entries(np);
|
||||
|
||||
notifier_call_chain(&pSeries_reconfig_chain,
|
||||
blocking_notifier_call_chain(&pSeries_reconfig_chain,
|
||||
PSERIES_RECONFIG_REMOVE, np);
|
||||
of_detach_node(np);
|
||||
|
||||
|
Reference in New Issue
Block a user