Deleted Added
full compact
kern_sharedpage.c (248084) kern_sharedpage.c (254025)
1/*-
2 * Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/kern/kern_sharedpage.c 248084 2013-03-09 02:32:23Z attilio $");
28__FBSDID("$FreeBSD: head/sys/kern/kern_sharedpage.c 254025 2013-08-07 06:21:20Z jeff $");
29
30#include "opt_compat.h"
31#include "opt_vm.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/lock.h>

--- 70 unchanged lines hidden (view full) ---

107 sx_init(&shared_page_alloc_sx, "shpsx");
108 shared_page_obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE,
109 VM_PROT_DEFAULT, 0, NULL);
110 VM_OBJECT_WLOCK(shared_page_obj);
111 m = vm_page_grab(shared_page_obj, 0, VM_ALLOC_RETRY | VM_ALLOC_NOBUSY |
112 VM_ALLOC_ZERO);
113 m->valid = VM_PAGE_BITS_ALL;
114 VM_OBJECT_WUNLOCK(shared_page_obj);
29
30#include "opt_compat.h"
31#include "opt_vm.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/lock.h>

--- 70 unchanged lines hidden (view full) ---

107 sx_init(&shared_page_alloc_sx, "shpsx");
108 shared_page_obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE,
109 VM_PROT_DEFAULT, 0, NULL);
110 VM_OBJECT_WLOCK(shared_page_obj);
111 m = vm_page_grab(shared_page_obj, 0, VM_ALLOC_RETRY | VM_ALLOC_NOBUSY |
112 VM_ALLOC_ZERO);
113 m->valid = VM_PAGE_BITS_ALL;
114 VM_OBJECT_WUNLOCK(shared_page_obj);
115 addr = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
115 addr = kva_alloc(PAGE_SIZE);
116 pmap_qenter(addr, &m, 1);
117 shared_page_mapping = (char *)addr;
118}
119
120SYSINIT(shp, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t)shared_page_init,
121 NULL);
122
123static void

--- 117 unchanged lines hidden ---
116 pmap_qenter(addr, &m, 1);
117 shared_page_mapping = (char *)addr;
118}
119
120SYSINIT(shp, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t)shared_page_init,
121 NULL);
122
123static void

--- 117 unchanged lines hidden ---