diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-13 09:59:13 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-13 09:59:13 +0000 |
| commit | bfc4a58986ba3934bb256ef3567aeeab262aa959 (patch) | |
| tree | bd26e4a6a10e19b510cec9674448bdb18633630a /arch | |
| parent | 09495dda6a62c74b13412a63528093910ef80edd (diff) | |
| parent | 1421954bf9b967d819db23c911f950a2ccd60eff (diff) | |
Merge branch 'for-next' from git://sources.calxeda.com/kernel/linux.git
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
| -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 1303021748c..9f20566b077 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -64,7 +64,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); + raw_spin_lock(&devtree_lock); prevp = &dp->properties; while (*prevp) { struct property *prop = *prevp; @@ -91,7 +91,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len } prevp = &(*prevp)->next; } - write_unlock(&devtree_lock); + raw_spin_unlock(&devtree_lock); mutex_unlock(&of_set_property_mutex); /* XXX Upate procfs if necessary... */ |