diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:18:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:18:20 -0400 |
| commit | bf2937695fe2330bfd8933a2310e7bdd2581dc2e (patch) | |
| tree | 66286a4ae2bf4d5c317e7270b92effa570e7f1d7 /arch/sh/mm/pmb.c | |
| parent | 1a5f20fe197f814fc0b29173894a706f478db821 (diff) | |
| parent | 5967d33ce8a030f01a716fc0b25fcb03744a5fda (diff) | |
Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
clocksource: sh_cmt: Fix up bogus shift value.
arch/sh/mm: Eliminate a double lock
sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
sh: remove duplicated #include
Diffstat (limited to 'arch/sh/mm/pmb.c')
| -rw-r--r-- | arch/sh/mm/pmb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c index 18623ba751b3..6379091a1647 100644 --- a/arch/sh/mm/pmb.c +++ b/arch/sh/mm/pmb.c | |||
| @@ -770,7 +770,7 @@ static void __init pmb_resize(void) | |||
| 770 | spin_unlock_irqrestore(&pmbe->lock, flags); | 770 | spin_unlock_irqrestore(&pmbe->lock, flags); |
| 771 | } | 771 | } |
| 772 | 772 | ||
| 773 | read_lock(&pmb_rwlock); | 773 | read_unlock(&pmb_rwlock); |
| 774 | } | 774 | } |
| 775 | #endif | 775 | #endif |
| 776 | 776 | ||