Module Name: src
Committed By: maxv
Date: Fri Jul 1 10:20:10 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/x86/x86: pmap.c
Log Message:
Remove this area (unused).
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.196 -r1.197 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.217 src/sys/arch/amd64/amd64/machdep.c:1.218
--- src/sys/arch/amd64/amd64/machdep.c:1.217 Sun May 15 10:35:54 2016
+++ src/sys/arch/amd64/amd64/machdep.c Fri Jul 1 10:20:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.217 2016/05/15 10:35:54 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.218 2016/07/01 10:20:10 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.217 2016/05/15 10:35:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.218 2016/07/01 10:20:10 maxv Exp $");
/* #define XENDEBUG_LOW */
@@ -267,9 +267,6 @@ unsigned int msgbuf_p_cnt = 0;
vaddr_t idt_vaddr;
paddr_t idt_paddr;
-vaddr_t lo32_vaddr;
-paddr_t lo32_paddr;
-
vaddr_t module_start, module_end;
static struct vm_map module_map_store;
extern struct vm_map *module_map;
@@ -1657,7 +1654,6 @@ init_x86_64(paddr_t first_avail)
pmap_kenter_pa(idt_vaddr + 2 * PAGE_SIZE, idt_paddr + 2 * PAGE_SIZE,
VM_PROT_READ|VM_PROT_WRITE, 0);
#endif
- pmap_kenter_pa(lo32_vaddr, lo32_paddr, VM_PROT_READ|VM_PROT_WRITE, 0);
pmap_update(pmap_kernel());
#ifndef XEN
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.196 src/sys/arch/x86/x86/pmap.c:1.197
--- src/sys/arch/x86/x86/pmap.c:1.196 Sat May 21 07:15:56 2016
+++ src/sys/arch/x86/x86/pmap.c Fri Jul 1 10:20:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.196 2016/05/21 07:15:56 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.197 2016/07/01 10:20:10 maxv Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.196 2016/05/21 07:15:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.197 2016/07/01 10:20:10 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -545,11 +545,6 @@ static struct pool_allocator pmap_pdp_al
extern vaddr_t idt_vaddr; /* we allocate IDT early */
extern paddr_t idt_paddr;
-#ifdef _LP64
-extern vaddr_t lo32_vaddr;
-extern vaddr_t lo32_paddr;
-#endif
-
extern int end;
#ifdef i386
@@ -1543,17 +1538,6 @@ pmap_bootstrap(vaddr_t kva_start)
#endif /* defined(__x86_64__) */
#endif /* XEN */
-#ifdef _LP64
- /*
- * Grab a page below 4G for things that need it (i.e.
- * having an initial %cr3 for the MP trampoline).
- */
- lo32_vaddr = virtual_avail;
- virtual_avail += PAGE_SIZE;
- lo32_paddr = avail_start;
- avail_start += PAGE_SIZE;
-#endif
-
/*
* now we reserve some VM for mapping pages when doing a crash dump
*/
