diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1999-09-04 13:03:15 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1999-09-04 13:03:15 +0000 |
| commit | c2826ce48e02c105163625532fd843c3c0c08108 (patch) | |
| tree | 413d9bd9443468996b3d2af37f5c5b2d3fea694a | |
| parent | 90546c60847c045505c9e8256ea72c8cba71e975 (diff) | |
1999-08-10 Thomas Bushnell, BSG <tb@mit.edu>
* i386/i386at/model_dep.c (init_alloc_aligned): Revert previous
change except for the one to AVAIL_NEXT. All the rest of the
previous code was correct. Correction from Momchil Velikov
(velco@fadata.bg).
| -rw-r--r-- | i386/i386at/model_dep.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index 57260fa..cddbf26 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -479,7 +479,7 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp) avail_next += size; /* Skip past the I/O and ROM area. */ - if ((avail_next >= (boot_info->mem_lower * 0x400)) && (addr < 0x100000)) + if ((avail_next > (boot_info->mem_lower * 0x400)) && (addr < 0x100000)) { avail_next = 0x100000; goto retry; @@ -491,29 +491,29 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp) } /* Skip our own kernel code, data, and bss. */ - if ((avail_next >= (vm_offset_t)start) && (addr < (vm_offset_t)end)) + if ((avail_next > (vm_offset_t)start) && (addr < (vm_offset_t)end)) { avail_next = (vm_offset_t)end; goto retry; } /* Skip any areas occupied by valuable boot_info data. */ - if ((avail_next >= boot_info_start_pa) && (addr < boot_info_end_pa)) + if ((avail_next > boot_info_start_pa) && (addr < boot_info_end_pa)) { avail_next = boot_info_end_pa; goto retry; } - if ((avail_next >= cmdline_start_pa) && (addr < cmdline_end_pa)) + if ((avail_next > cmdline_start_pa) && (addr < cmdline_end_pa)) { avail_next = cmdline_end_pa; goto retry; } - if ((avail_next >= mods_start_pa) && (addr < mods_end_pa)) + if ((avail_next > mods_start_pa) && (addr < mods_end_pa)) { avail_next = mods_end_pa; goto retry; } - if ((avail_next >= kern_sym_start) && (addr < kern_sym_end)) + if ((avail_next > kern_sym_start) && (addr < kern_sym_end)) { avail_next = kern_sym_end; goto retry; @@ -524,7 +524,7 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp) phystokv(boot_info->mods_addr); for (i = 0; i < boot_info->mods_count; i++) { - if ((avail_next >= m[i].mod_start) + if ((avail_next > m[i].mod_start) && (addr < m[i].mod_end)) { avail_next = m[i].mod_end; |