From 2a0ca39389abca02fa99d7cba83f546601975e6d Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 14 Jul 2006 00:23:59 -0700 Subject: [PATCH] --- yaml --- r: 32620 b: refs/heads/master c: a7546075e7c08821732fa04119a9005c55ab432d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/setup.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0cefc0516634..25f651a60e42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7015331098cc156c30282588bbd30bbf7a59291 +refs/heads/master: a7546075e7c08821732fa04119a9005c55ab432d diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c index 7864395c1441..f1682206d304 100644 --- a/trunk/arch/i386/kernel/setup.c +++ b/trunk/arch/i386/kernel/setup.c @@ -1327,7 +1327,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat res->start = e820.map[i].addr; res->end = res->start + e820.map[i].size - 1; res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; - request_resource(&iomem_resource, res); + if (request_resource(&iomem_resource, res)) { + kfree(res); + continue; + } if (e820.map[i].type == E820_RAM) { /* * We don't know which RAM region contains kernel data,