| From 986730aa7012a52adaca67662075cd07e8256ed6 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 16 Jan 2011 19:11:35 -0500 |
| Subject: [PATCH] sparc: devtree_lock as raw. |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c |
| index 57ac9e2..2e0a1d5 100644 |
| --- a/arch/sparc/kernel/prom_common.c |
| +++ b/arch/sparc/kernel/prom_common.c |
| @@ -68,7 +68,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; |
| @@ -95,7 +95,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... */ |
| -- |
| 1.7.1.1 |
| |