projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
[powerpc.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
reconfig.c
diff --git
a/arch/powerpc/platforms/pseries/reconfig.c
b/arch/powerpc/platforms/pseries/reconfig.c
index
86cfa6e
..
1773103
100644
(file)
--- a/
arch/powerpc/platforms/pseries/reconfig.c
+++ b/
arch/powerpc/platforms/pseries/reconfig.c
@@
-17,8
+17,9
@@
#include <linux/proc_fs.h>
#include <asm/prom.h>
#include <linux/proc_fs.h>
#include <asm/prom.h>
-#include <asm/
pSeries_reconfig
.h>
+#include <asm/
machdep
.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
+#include <asm/pSeries_reconfig.h>
@@
-94,16
+95,16
@@
static struct device_node *derive_parent(const char *path)
return parent;
}
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)
{
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)
{
}
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)
}
static int pSeries_reconfig_add_node(const char *path, struct property *proplist)
@@
-131,7
+132,7
@@
static int pSeries_reconfig_add_node(const char *path, struct property *proplist
goto out_err;
}
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);
PSERIES_RECONFIG_ADD, np);
if (err == NOTIFY_BAD) {
printk(KERN_ERR "Failed to add device node %s\n", path);
@@
-171,7
+172,7
@@
static int pSeries_reconfig_remove_node(struct device_node *np)
remove_node_proc_entries(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);
PSERIES_RECONFIG_REMOVE, np);
of_detach_node(np);
@@
-508,7
+509,7
@@
static int proc_ppc64_create_ofdt(void)
{
struct proc_dir_entry *ent;
{
struct proc_dir_entry *ent;
- if (!
platform_is_pseries(
))
+ if (!
machine_is(pseries
))
return 0;
ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);
return 0;
ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);