Module Name: src
Committed By: christos
Date: Thu Oct 17 20:57:58 UTC 2013
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
Log Message:
remove unused variable, and move variable used only by XEN in the XEN ifdef.
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/amd64/amd64/machdep.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.195 src/sys/arch/amd64/amd64/machdep.c:1.196
--- src/sys/arch/amd64/amd64/machdep.c:1.195 Wed Jun 5 10:37:04 2013
+++ src/sys/arch/amd64/amd64/machdep.c Thu Oct 17 16:57:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.195 2013/06/05 14:37:04 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.196 2013/10/17 20:57:58 christos 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.195 2013/06/05 14:37:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196 2013/10/17 20:57:58 christos Exp $");
/* #define XENDEBUG_LOW */
@@ -1051,7 +1051,6 @@ cpu_dump_mempagecnt(void)
int
cpu_dump(void)
{
- int (*dump)(dev_t, daddr_t, void *, size_t);
kcore_seg_t seg;
cpu_kcore_hdr_t cpuhdr;
const struct bdevsw *bdev;
@@ -1060,8 +1059,6 @@ cpu_dump(void)
if (bdev == NULL)
return (ENXIO);
- dump = bdev->d_dump;
-
/*
* Generate a segment header.
*/
@@ -1567,7 +1564,6 @@ init_x86_64(paddr_t first_avail)
extern void consinit(void);
struct region_descriptor region;
struct mem_segment_descriptor *ldt_segp;
- struct pcb *pcb;
int x;
#ifndef XEN
int ist;
@@ -1588,11 +1584,11 @@ init_x86_64(paddr_t first_avail)
cpu_init_msrs(&cpu_info_primary, true);
- pcb = lwp_getpcb(&lwp0);
use_pae = 1; /* PAE always enabled in long mode */
#ifdef XEN
+ struct pcb *pcb = lwp_getpcb(&lwp0);
mutex_init(&pte_lock, MUTEX_DEFAULT, IPL_VM);
pcb->pcb_cr3 = xen_start_info.pt_base - KERNBASE;
__PRINTK(("pcb_cr3 0x%lx\n", xen_start_info.pt_base - KERNBASE));
