summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/mp_machdep.c6
-rw-r--r--sys/amd64/amd64/mptable.c6
-rw-r--r--sys/amd64/include/mptable.h6
-rw-r--r--sys/i386/i386/mp_machdep.c6
-rw-r--r--sys/i386/i386/mptable.c6
-rw-r--r--sys/i386/i386/perfmon.c4
-rw-r--r--sys/i386/i386/userconfig.c6
-rw-r--r--sys/i386/include/mptable.h6
-rw-r--r--sys/kern/subr_smp.c6
9 files changed, 28 insertions, 24 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 17e6945..dd9f144 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 17e6945..dd9f144 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 17e6945..dd9f144 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 17e6945..dd9f144 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 17e6945..dd9f144 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index d772665..0720c62 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: perfmon.c,v 1.15 1997/12/29 23:36:56 phk Exp $
+ * $Id: perfmon.c,v 1.16 1998/12/07 21:58:18 archie Exp $
*/
#include <sys/param.h>
@@ -41,7 +41,9 @@
static int perfmon_inuse;
static int perfmon_cpuok;
+#ifndef SMP
static int msr_ctl[NPMC];
+#endif
static int msr_pmc[NPMC];
static unsigned int ctl_shadow[NPMC];
static quad_t pmc_shadow[NPMC]; /* used when ctr is stopped on P5 */
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 884b1cb..15c1a93 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
- ** $Id: userconfig.c,v 1.121 1999/01/08 21:00:26 abial Exp $
+ ** $Id: userconfig.c,v 1.122 1999/01/09 18:12:05 wpaul Exp $
**/
/**
@@ -2516,7 +2516,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: userconfig.c,v 1.121 1999/01/08 21:00:26 abial Exp $
+ * $Id: userconfig.c,v 1.122 1999/01/09 18:12:05 wpaul Exp $
*/
#include "scbus.h"
@@ -2607,10 +2607,12 @@ static CmdParm dev_parms[] = {
{ -1, {} },
};
+#if NPNP > 0
static CmdParm string_arg[] = {
{ PARM_STRING, {} },
{ -1, {} },
};
+#endif
#if NEISA > 0
static CmdParm int_arg[] = {
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 17e6945..dd9f144 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 17e6945..dd9f144 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.85 1998/11/26 23:14:23 tegge Exp $
+ * $Id: mp_machdep.c,v 1.86 1998/12/07 21:58:18 archie Exp $
*/
#include "opt_smp.h"
@@ -1009,8 +1009,8 @@ fix_mp_table(void)
{
int x;
int id;
- int bus_0;
- int bus_pci;
+ int bus_0 = 0; /* Stop GCC warning */
+ int bus_pci = 0; /* Stop GCC warning */
int num_pci_bus;
/*
OpenPOWER on IntegriCloud