Deleted Added
full compact
machdep.c (336963) machdep.c (337262)
1/*-
2 * Copyright (c) 2003 Peter Wemm.
3 * Copyright (c) 1992 Terrence R. Lambert.
4 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * William Jolitz.

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

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
39 */
40
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003 Peter Wemm.
3 * Copyright (c) 1992 Terrence R. Lambert.
4 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * William Jolitz.

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

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: stable/11/sys/amd64/amd64/machdep.c 336963 2018-07-31 10:18:30Z kib $");
42__FBSDID("$FreeBSD: stable/11/sys/amd64/amd64/machdep.c 337262 2018-08-03 15:42:39Z markj $");
43
44#include "opt_atpic.h"
45#include "opt_compat.h"
46#include "opt_cpu.h"
47#include "opt_ddb.h"
48#include "opt_inet.h"
49#include "opt_isa.h"
50#include "opt_kstack_pages.h"

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

95#include <vm/vm.h>
96#include <vm/vm_extern.h>
97#include <vm/vm_kern.h>
98#include <vm/vm_page.h>
99#include <vm/vm_map.h>
100#include <vm/vm_object.h>
101#include <vm/vm_pager.h>
102#include <vm/vm_param.h>
43
44#include "opt_atpic.h"
45#include "opt_compat.h"
46#include "opt_cpu.h"
47#include "opt_ddb.h"
48#include "opt_inet.h"
49#include "opt_isa.h"
50#include "opt_kstack_pages.h"

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

95#include <vm/vm.h>
96#include <vm/vm_extern.h>
97#include <vm/vm_kern.h>
98#include <vm/vm_page.h>
99#include <vm/vm_map.h>
100#include <vm/vm_object.h>
101#include <vm/vm_pager.h>
102#include <vm/vm_param.h>
103#include <vm/vm_phys.h>
103
104#ifdef DDB
105#ifndef KDB
106#error KDB must be enabled in order for DDB to work!
107#endif
108#include <ddb/ddb.h>
109#include <ddb/db_sym.h>
110#endif

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

1225{
1226 int i, physmap_idx, pa_indx, da_indx;
1227 vm_paddr_t pa, physmap[PHYSMAP_SIZE];
1228 u_long physmem_start, physmem_tunable, memtest;
1229 pt_entry_t *pte;
1230 quad_t dcons_addr, dcons_size;
1231 int page_counter;
1232
104
105#ifdef DDB
106#ifndef KDB
107#error KDB must be enabled in order for DDB to work!
108#endif
109#include <ddb/ddb.h>
110#include <ddb/db_sym.h>
111#endif

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

1226{
1227 int i, physmap_idx, pa_indx, da_indx;
1228 vm_paddr_t pa, physmap[PHYSMAP_SIZE];
1229 u_long physmem_start, physmem_tunable, memtest;
1230 pt_entry_t *pte;
1231 quad_t dcons_addr, dcons_size;
1232 int page_counter;
1233
1234 /*
1235 * Tell the physical memory allocator about pages used to store
1236 * the kernel and preloaded data. See kmem_bootstrap_free().
1237 */
1238 vm_phys_add_seg((vm_paddr_t)kernphys, trunc_page(first));
1239
1233 bzero(physmap, sizeof(physmap));
1234 physmap_idx = 0;
1235
1236 init_ops.parse_memmap(kmdp, physmap, &physmap_idx);
1237 physmap_idx -= 2;
1238
1239 /*
1240 * Find the 'base memory' segment for SMP

--- 1407 unchanged lines hidden ---
1240 bzero(physmap, sizeof(physmap));
1241 physmap_idx = 0;
1242
1243 init_ops.parse_memmap(kmdp, physmap, &physmap_idx);
1244 physmap_idx -= 2;
1245
1246 /*
1247 * Find the 'base memory' segment for SMP

--- 1407 unchanged lines hidden ---