git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
sysdev
/
mmio_nvram.c
diff --git
a/arch/powerpc/sysdev/mmio_nvram.c
b/arch/powerpc/sysdev/mmio_nvram.c
index
74e0d31
..
615350d
100644
(file)
--- a/
arch/powerpc/sysdev/mmio_nvram.c
+++ b/
arch/powerpc/sysdev/mmio_nvram.c
@@
-32,7
+32,7
@@
static void __iomem *mmio_nvram_start;
static long mmio_nvram_len;
static void __iomem *mmio_nvram_start;
static long mmio_nvram_len;
-static
spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(mmio_nvram_lock)
;
static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)
{
static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)
{