diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:48:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 04:48:05 -0400 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/mm/pmb.c | |
| parent | c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe (diff) | |
| parent | 21823259a70b7a2a21eea1d48c25a6f38896dd11 (diff) | |
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, | |||
| 341 | unsigned long flags, pmb_flags; | 341 | unsigned long flags, pmb_flags; |
| 342 | int i, mapped; | 342 | int i, mapped; |
| 343 | 343 | ||
| 344 | if (size < SZ_16M) | ||
| 345 | return -EINVAL; | ||
| 344 | if (!pmb_addr_valid(vaddr, size)) | 346 | if (!pmb_addr_valid(vaddr, size)) |
| 345 | return -EFAULT; | 347 | return -EFAULT; |
| 346 | if (pmb_mapping_exists(vaddr, phys, size)) | 348 | if (pmb_mapping_exists(vaddr, phys, size)) |