diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-13 20:52:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-13 20:52:39 -0700 |
| commit | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch) | |
| tree | b7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /arch/s390/mm/vmem.c | |
| parent | 875ec4333b99144e2589e900a0bcd2c25c757b27 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smc911x.c
Diffstat (limited to 'arch/s390/mm/vmem.c')
| -rw-r--r-- | arch/s390/mm/vmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index f591188fa2c..e4868bfc672 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -236,7 +236,7 @@ static int insert_memory_segment(struct memory_segment *seg) { struct memory_segment *tmp; - if (seg->start + seg->size >= VMEM_MAX_PHYS || + if (seg->start + seg->size > VMEM_MAX_PHYS || seg->start + seg->size < seg->start) return -ERANGE; |