From e8384aa3a83ee609e67041c9ffb55f4587e5ceb0 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 4 Sep 2008 20:59:22 +0200 Subject: [PATCH] --- yaml --- r: 112769 b: refs/heads/master c: fac8f1e4f99dff7a0c3a929f327d66f46de6fa21 h: refs/heads/master i: 112767: 78d2889797acfa67dfe287fff6ea12d95606e681 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/e820.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 549a3d8db34f..dc1ed3939357 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8040d77688014987ca5738bf1731db72ab273441 +refs/heads/master: fac8f1e4f99dff7a0c3a929f327d66f46de6fa21 diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index a7a71339bfb0..e24d1bc47b46 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/arch/x86/kernel/e820.c @@ -1320,7 +1320,7 @@ void __init e820_reserve_resources_late(void) res = e820_res; for (i = 0; i < e820.nr_map; i++) { if (!res->parent && res->end) - insert_resource(&iomem_resource, res); + reserve_region_with_split(&iomem_resource, res->start, res->end, res->name); res++; } }