git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[pandora-kernel.git]
/
arch
/
sh
/
mm
/
pmb.c
diff --git
a/arch/sh/mm/pmb.c
b/arch/sh/mm/pmb.c
index
e43ec60
..
18623ba
100644
(file)
--- 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;
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))
if (!pmb_addr_valid(vaddr, size))
return -EFAULT;
if (pmb_mapping_exists(vaddr, phys, size))
@@
-680,7
+682,7
@@
static void __init pmb_merge(struct pmb_entry *head)
/*
* The merged page size must be valid.
*/
/*
* The merged page size must be valid.
*/
- if (!pmb_size_valid(newsize))
+ if (!
depth || !
pmb_size_valid(newsize))
return;
head->flags &= ~PMB_SZ_MASK;
return;
head->flags &= ~PMB_SZ_MASK;