| link_elf_obj.c (241896) | link_elf_obj.c (255426) |
|---|---|
| 1/*- 2 * Copyright (c) 1998-2000 Doug Rabson 3 * Copyright (c) 2004 Peter Wemm 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998-2000 Doug Rabson 3 * Copyright (c) 2004 Peter Wemm 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 12 unchanged lines hidden (view full) --- 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/kern/link_elf_obj.c 241896 2012-10-22 17:50:54Z kib $"); | 29__FBSDID("$FreeBSD: head/sys/kern/link_elf_obj.c 255426 2013-09-09 18:11:59Z jhb $"); |
| 30 31#include "opt_ddb.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/kernel.h> 36#include <sys/lock.h> 37#include <sys/malloc.h> --- 646 unchanged lines hidden (view full) --- 684 * mapping that is above the kernel. 685 */ 686#ifdef __amd64__ 687 mapbase = KERNBASE; 688#else 689 mapbase = VM_MIN_KERNEL_ADDRESS; 690#endif 691 error = vm_map_find(kernel_map, ef->object, 0, &mapbase, | 30 31#include "opt_ddb.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/kernel.h> 36#include <sys/lock.h> 37#include <sys/malloc.h> --- 646 unchanged lines hidden (view full) --- 684 * mapping that is above the kernel. 685 */ 686#ifdef __amd64__ 687 mapbase = KERNBASE; 688#else 689 mapbase = VM_MIN_KERNEL_ADDRESS; 690#endif 691 error = vm_map_find(kernel_map, ef->object, 0, &mapbase, |
| 692 round_page(mapsize), TRUE, VM_PROT_ALL, VM_PROT_ALL, FALSE); | 692 round_page(mapsize), 0, VMFS_OPTIMAL_SPACE, VM_PROT_ALL, 693 VM_PROT_ALL, 0); |
| 693 if (error) { 694 vm_object_deallocate(ef->object); 695 ef->object = 0; 696 goto out; 697 } 698 699 /* Wire the pages */ 700 error = vm_map_wire(kernel_map, mapbase, --- 675 unchanged lines hidden --- | 694 if (error) { 695 vm_object_deallocate(ef->object); 696 ef->object = 0; 697 goto out; 698 } 699 700 /* Wire the pages */ 701 error = vm_map_wire(kernel_map, mapbase, --- 675 unchanged lines hidden --- |