diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 10:48:05 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 10:48:05 +0200 |
commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/mm/pmb.c | |
parent | Merge branch 'sh/clkfwk' (diff) | |
parent | sh: Ensure active regions have a backing PMB entry. (diff) | |
download | linux-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz linux-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/mm/pmb.c')
-rw-r--r-- | arch/sh/mm/pmb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c index e9f5384f3f1c..18623ba751b3 100644 --- a/arch/sh/mm/pmb.c +++ b/arch/sh/mm/pmb.c @@ -341,6 +341,8 @@ int pmb_bolt_mapping(unsigned long vaddr, phys_addr_t phys, unsigned long flags, pmb_flags; int i, mapped; + if (size < SZ_16M) + return -EINVAL; if (!pmb_addr_valid(vaddr, size)) return -EFAULT; if (pmb_mapping_exists(vaddr, phys, size)) |