[src/trunk]: src/sys/arch/x86/x86 Revert previous. Removing unused variable...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c61a67f0bd7e
branches:  trunk
changeset: 824306:c61a67f0bd7e
user:      kre <kre%NetBSD.org@localhost>
date:      Wed May 31 14:37:19 2017 +0000

description:
Revert previous.   Removing unused variable declarations is only a good
idea when the variable is, in fact, unused.

diffstat:

 sys/arch/x86/x86/cpu.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r f126ec594d50 -r c61a67f0bd7e sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Wed May 31 14:18:36 2017 +0000
+++ b/sys/arch/x86/x86/cpu.c    Wed May 31 14:37:19 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.128 2017/05/31 10:15:18 pgoyette Exp $       */
+/*     $NetBSD: cpu.c,v 1.129 2017/05/31 14:37:19 kre Exp $    */
 
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.128 2017/05/31 10:15:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.129 2017/05/31 14:37:19 kre Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -802,6 +802,7 @@
 {
        struct cpu_info *ci = (struct cpu_info *)v;
        struct pcb *pcb;
+       int s;
 
        cpu_init_msrs(ci, true);
        cpu_probe(ci);