diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 01:12:40 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 01:12:40 -0500 |
| commit | d71ef3ab4cc7081ba7b013101fdbcabf7c96bf9d (patch) | |
| tree | 7e9b136b3c0750baa777706d98eb61bb0788fd71 | |
| parent | bdb69332968733e4dbfcbd62243da31d99013b1c (diff) | |
| download | rt-patches-d71ef3ab4cc7081ba7b013101fdbcabf7c96bf9d.tar.gz | |
sparc gets OF decl from common OF file nowv2.6.33-179-g6ebdc66
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | sparc-devtree_lock-as-raw.patch | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sparc-devtree_lock-as-raw.patch b/sparc-devtree_lock-as-raw.patch index 38fc933..d29ea7e 100644 --- a/sparc-devtree_lock-as-raw.patch +++ b/sparc-devtree_lock-as-raw.patch @@ -1,4 +1,4 @@ -From 5c01e4e6d48b58204da3da6b0f699e1d5afef09d Mon Sep 17 00:00:00 2001 +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. @@ -24,24 +24,11 @@ break them out into separate explicit commits. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> -diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h -index 453397f..0f14b12 100644 ---- a/arch/sparc/kernel/prom.h -+++ b/arch/sparc/kernel/prom.h -@@ -5,7 +5,7 @@ - #include <asm/prom.h> - - extern struct device_node *allnodes; /* temporary while merging */ --extern rwlock_t devtree_lock; /* temporary while merging */ -+extern raw_spinlock_t devtree_lock; /* temporary while merging */ - - extern void * prom_early_alloc(unsigned long size); - extern void irq_trans_init(struct device_node *dp); diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c -index d80a65d..a5b1b81 100644 +index 57ac9e2..2e0a1d5 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c -@@ -80,7 +80,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len +@@ -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); @@ -50,7 +37,7 @@ index d80a65d..a5b1b81 100644 prevp = &dp->properties; while (*prevp) { struct property *prop = *prevp; -@@ -107,7 +107,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len +@@ -95,7 +95,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len } prevp = &(*prevp)->next; } |