Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge MACHINE_ARCH and other changes so branch builds on alpha.

  • Loading branch information...
commit 202faed58e6e7e6bf007b549aec0da4d802a1624 1 parent 32eb685
authored June 12, 1997

Showing 1 changed file with 6 additions and 5 deletions. Show diff stats Hide diff stats

  1. 11  sys/arch/alpha/alpha/machdep.c
11  sys/arch/alpha/alpha/machdep.c
... ...
@@ -1,4 +1,4 @@
1  
-/* $NetBSD: machdep.c,v 1.76.2.1 1997/05/04 15:18:26 mrg Exp $ */
  1
+/* $NetBSD: machdep.c,v 1.76.2.2 1997/06/12 04:20:06 tls Exp $ */
2 2
 
3 3
 /*
4 4
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
30 30
 #include <machine/options.h>		/* Config options headers */
31 31
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
32 32
 
33  
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76.2.1 1997/05/04 15:18:26 mrg Exp $");
  33
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76.2.2 1997/06/12 04:20:06 tls Exp $");
34 34
 
35 35
 #include <sys/param.h>
36 36
 #include <sys/systm.h>
@@ -154,7 +154,8 @@ int	cputype;		/* system type, from the RPB */
154 154
 u_int32_t no_optimize;
155 155
 
156 156
 /* the following is used externally (sysctl_hw) */
157  
-char	machine[] = "alpha";
  157
+char	machine[] = MACHINE;		/* from <machine/param.h> */
  158
+char	machine_arch[] = MACHINE_ARCH;	/* from <machine/param.h> */
158 159
 char	cpu_model[128];
159 160
 const struct cpusw *cpu_fn_switch;		/* function switch */
160 161
 
@@ -196,10 +197,10 @@ alpha_init(pfn, ptb)
196 197
 	char *p;
197 198
 
198 199
 	/*
199  
-	 * Turn off interrupts and floating point.
  200
+	 * Turn off interrupts (not mchecks) and floating point.
200 201
 	 * Make sure the instruction and data streams are consistent.
201 202
 	 */
202  
-	(void)splhigh();
  203
+	(void)alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH);
203 204
 	alpha_pal_wrfen(0);
204 205
 	ALPHA_TBIA();
205 206
 	alpha_pal_imb();

0 notes on commit 202faed

Please sign in to comment.
Something went wrong with that request. Please try again.