aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorScott Long <scottl@FreeBSD.org>2007-02-23 22:53:56 +0000
committerScott Long <scottl@FreeBSD.org>2007-02-23 22:53:56 +0000
commit04f0ce213f80275a7ea31ceeef30957f5202bf22 (patch)
tree4b631a2591cb20c889b7a2d990a0c9630e08afea /sys
parent1a26db0a3a744efecaf35971ca7ad0c9b18a7efe (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_rman.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index b17ea74d391c..609814ef934b 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -209,13 +209,14 @@ rman_manage_region(struct rman *rm, u_long start, u_long end)
s->r_end = r->r_end;
free(r, M_RMAN);
}
- } else {
+ } else if (t != NULL) {
/* Can we merge with just the next region? */
- if (t != NULL) {
- t->r_start = r->r_start;
- free(r, M_RMAN);
- } else
- TAILQ_INSERT_BEFORE(s, r, r_link);
+ t->r_start = r->r_start;
+ free(r, M_RMAN);
+ } else if (s->r_end < r->r_start) {
+ TAILQ_INSERT_AFTER(&rm->rm_list, s, r, r_link);
+ } else {
+ TAILQ_INSERT_BEFORE(s, r, r_link);
}
}