diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 01:41:20 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 01:41:20 (GMT) |
| commit | 1c9d80ddc60f8ac26344ec3db9830e5f8016c16d (patch) | |
| tree | e62ce00ce44b61e378af4aefa68ce7f9acdf9e23 | |
| parent | 88b938e63e68fd35e603421f722be0f35dde1016 (diff) | |
| download | linux-1c9d80ddc60f8ac26344ec3db9830e5f8016c16d.tar.xz | |
sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab.
Otherwise we try to sleep with preemption disabled, etc.
Noticed by Thomas Gleixner.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 138910c..d80a65d 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -79,6 +79,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len err = -ENODEV; + mutex_lock(&of_set_property_mutex); write_lock(&devtree_lock); prevp = &dp->properties; while (*prevp) { @@ -88,9 +89,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len void *old_val = prop->value; int ret; - mutex_lock(&of_set_property_mutex); ret = prom_setprop(dp->node, name, val, len); - mutex_unlock(&of_set_property_mutex); err = -EINVAL; if (ret >= 0) { @@ -109,6 +108,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len prevp = &(*prevp)->next; } write_unlock(&devtree_lock); + mutex_unlock(&of_set_property_mutex); /* XXX Upate procfs if necessary... */ |