Skip to content

Commit

Permalink
Sync with HEAD.
Browse files Browse the repository at this point in the history
  • Loading branch information
ad committed Dec 3, 2007
1 parent d9cc6b8 commit 9ce3b0e
Show file tree
Hide file tree
Showing 152 changed files with 28,250 additions and 1,411 deletions.
10 changes: 2 additions & 8 deletions sys/arch/alpha/alpha/cpu.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.73.30.4 2007/12/03 18:34:29 ad Exp $ */
/* $NetBSD: cpu.c,v 1.73.30.5 2007/12/03 19:02:22 ad Exp $ */

/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
Expand Down Expand Up @@ -66,7 +66,7 @@

#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */

__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.73.30.4 2007/12/03 18:34:29 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.73.30.5 2007/12/03 19:02:22 ad Exp $");

#include "opt_ddb.h"
#include "opt_multiprocessor.h"
Expand Down Expand Up @@ -414,12 +414,6 @@ cpu_boot_secondary_processors(void)
did_patch = true;
}

/* Patch MP-criticial kernel routines. */
if (did_patch == false) {
alpha_patch(true);
did_patch = true;
}

/*
* Link the processor into the list, and launch it.
*/
Expand Down
7 changes: 4 additions & 3 deletions sys/arch/alpha/alpha/interrupt.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: interrupt.c,v 1.72.6.5 2007/12/03 18:34:29 ad Exp $ */
/* $NetBSD: interrupt.c,v 1.72.6.6 2007/12/03 19:02:23 ad Exp $ */

/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
Expand Down Expand Up @@ -72,7 +72,7 @@

#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */

__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.72.6.5 2007/12/03 18:34:29 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.72.6.6 2007/12/03 19:02:23 ad Exp $");

#include <sys/param.h>
#include <sys/systm.h>
Expand All @@ -98,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.72.6.5 2007/12/03 18:34:29 ad Exp $"
#include <machine/alpha.h>

struct scbvec scb_iovectab[SCB_VECTOIDX(SCB_SIZE - SCB_IOVECBASE)];
static bool scb_mpsafe[SCB_VECTOIDX(SCB_SIZE - SCB_IOVECBASE)];

void netintr(void);

Expand Down Expand Up @@ -532,7 +533,7 @@ rlprintf(struct timeval *t, const char *fmt, ...)

const static uint8_t ipl2psl_table[] = {
[IPL_NONE] = ALPHA_PSL_IPL_0,
[IPL_SOFT] = ALPHA_PSL_IPL_SOFT,
[IPL_SOFTCLOCK] = ALPHA_PSL_IPL_SOFT,
[IPL_VM] = ALPHA_PSL_IPL_IO,
[IPL_CLOCK] = ALPHA_PSL_IPL_CLOCK,
[IPL_HIGH] = ALPHA_PSL_IPL_HIGH,
Expand Down
9 changes: 2 additions & 7 deletions sys/arch/alpha/alpha/machdep.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.296.2.3 2007/12/03 18:34:29 ad Exp $ */
/* $NetBSD: machdep.c,v 1.296.2.4 2007/12/03 19:02:23 ad Exp $ */

/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
Expand Down Expand Up @@ -75,7 +75,7 @@

#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */

__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.296.2.3 2007/12/03 18:34:29 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.296.2.4 2007/12/03 19:02:23 ad Exp $");

#include <sys/param.h>
#include <sys/systm.h>
Expand Down Expand Up @@ -1419,11 +1419,6 @@ regdump(framep)
printregs(&reg);
}

/*
* Perform any initial kernel patches based on the running system.
* We may perform more later if we attach additional CPUs.
*/
alpha_patch(false);


void *
Expand Down
Loading

0 comments on commit 9ce3b0e

Please sign in to comment.