From 8fa4f7c165a65dce0c8d630a6f4319aaf718ea9f Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Sat, 5 Aug 2006 12:14:59 -0700 Subject: [PATCH] --- yaml --- r: 33249 b: refs/heads/master c: 0f04ab5efbca73ab366a156d96b073d2da35b158 h: refs/heads/master i: 33247: ab5ba3cda2cebfe86047d8c3ee45a0a8a54efa79 v: v3 --- [refs] | 2 +- trunk/kernel/resource.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 374b6f20c9c3..36187fe1cb74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f712711dbd180aa3777efe5ae3b9b0e915b9471 +refs/heads/master: 0f04ab5efbca73ab366a156d96b073d2da35b158 diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c index 0dd3a857579e..63e879379dbd 100644 --- a/trunk/kernel/resource.c +++ b/trunk/kernel/resource.c @@ -261,8 +261,10 @@ int find_next_system_ram(struct resource *res) if (!p) return -1; /* copy data */ - res->start = p->start; - res->end = p->end; + if (res->start < p->start) + res->start = p->start; + if (res->end > p->end) + res->end = p->end; return 0; } #endif