diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /arch/sh/mm/pmb.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
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 | ||