Permalink
Browse files

Merge MACHINE_ARCH and other changes so branch builds on alpha.

  • Loading branch information...
1 parent de4daae commit 6385c881537738a7fff15d1640933b3fbfa9e081 tls committed Jun 12, 1997
Showing with 6 additions and 5 deletions.
  1. +6 −5 sys/arch/alpha/alpha/machdep.c
View
11 sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.76.2.1 1997/05/04 15:18:26 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.76.2.2 1997/06/12 04:20:06 tls Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
#include <machine/options.h> /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76.2.1 1997/05/04 15:18:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76.2.2 1997/06/12 04:20:06 tls Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,7 +154,8 @@ int cputype; /* system type, from the RPB */
u_int32_t no_optimize;
/* the following is used externally (sysctl_hw) */
-char machine[] = "alpha";
+char machine[] = MACHINE; /* from <machine/param.h> */
+char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
char cpu_model[128];
const struct cpusw *cpu_fn_switch; /* function switch */
@@ -196,10 +197,10 @@ alpha_init(pfn, ptb)
char *p;
/*
- * Turn off interrupts and floating point.
+ * Turn off interrupts (not mchecks) and floating point.
* Make sure the instruction and data streams are consistent.
*/
- (void)splhigh();
+ (void)alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH);
alpha_pal_wrfen(0);
ALPHA_TBIA();
alpha_pal_imb();

0 comments on commit 6385c88

Please sign in to comment.