Merge branch 'sched/urgent' into sched/core

Merge reason: Pick up fixes that did not make it into .32.0

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 138910c67206..d80a65d9e893 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... */