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

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

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

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

33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
38 */
39
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: stable/11/sys/i386/i386/machdep.c 336963 2018-07-31 10:18:30Z kib $");
41__FBSDID("$FreeBSD: stable/11/sys/i386/i386/machdep.c 337262 2018-08-03 15:42:39Z markj $");
42
43#include "opt_apic.h"
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"

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

94#include <vm/vm.h>
95#include <vm/vm_extern.h>
96#include <vm/vm_kern.h>
97#include <vm/vm_page.h>
98#include <vm/vm_map.h>
99#include <vm/vm_object.h>
100#include <vm/vm_pager.h>
101#include <vm/vm_param.h>
42
43#include "opt_apic.h"
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"

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

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

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

2071 goto physmap_done;
2072 }
2073#endif
2074 bzero(&vmf, sizeof(vmf));
2075 bzero(physmap, sizeof(physmap));
2076 basemem = 0;
2077
2078 /*
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

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

2072 goto physmap_done;
2073 }
2074#endif
2075 bzero(&vmf, sizeof(vmf));
2076 bzero(physmap, sizeof(physmap));
2077 basemem = 0;
2078
2079 /*
2080 * Tell the physical memory allocator about pages used to store
2081 * the kernel and preloaded data. See kmem_bootstrap_free().
2082 */
2083 vm_phys_add_seg((vm_paddr_t)KERNLOAD, trunc_page(first));
2084
2085 /*
2079 * Check if the loader supplied an SMAP memory map. If so,
2080 * use that and do not make any VM86 calls.
2081 */
2082 physmap_idx = 0;
2083 kmdp = preload_search_by_type("elf kernel");
2084 if (kmdp == NULL)
2085 kmdp = preload_search_by_type("elf32 kernel");
2086 smapbase = (struct bios_smap *)preload_search_info(kmdp,

--- 1305 unchanged lines hidden ---
2086 * Check if the loader supplied an SMAP memory map. If so,
2087 * use that and do not make any VM86 calls.
2088 */
2089 physmap_idx = 0;
2090 kmdp = preload_search_by_type("elf kernel");
2091 if (kmdp == NULL)
2092 kmdp = preload_search_by_type("elf32 kernel");
2093 smapbase = (struct bios_smap *)preload_search_info(kmdp,

--- 1305 unchanged lines hidden ---