summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc/include/bsd_openprom.h10
-rw-r--r--sys/arch/sparc/include/oldmon.h5
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index cf348ec062d..a9692b1e195 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bsd_openprom.h,v 1.6 2000/12/06 17:18:59 deraadt Exp $ */
+/* $OpenBSD: bsd_openprom.h,v 1.7 2001/08/08 02:26:35 millert Exp $ */
/* $NetBSD: bsd_openprom.h,v 1.11 1996/05/18 12:27:43 mrg Exp $ */
/*
@@ -224,7 +224,7 @@ struct promvec {
void (*pv_printf) __P((const char *fmt, ...));
void (*pv_abort) __P((void)); /* L1-A abort */
int *pv_ticks; /* Ticks since last reset */
- __dead void (*pv_halt) __P((void)) __attribute__((__noreturn__));/* Halt! */
+ __dead void (*pv_halt) __P((void)); /* Halt! */
void (**pv_synchook) __P((void)); /* "sync" command hook */
/*
@@ -320,9 +320,7 @@ struct nodeops {
caddr_t (*no_nextprop) __P((int node, caddr_t name));
};
-void romhalt __P((void))
- __attribute__((__noreturn__));
-void romboot __P((char *))
- __attribute__((__noreturn__));
+__dead void romhalt __P((void));
+__dead void romboot __P((char *));
extern struct promvec *promvec;
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index c43b0ffdd8a..8069e4627d1 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: oldmon.h,v 1.5 2000/12/06 17:19:00 deraadt Exp $ */
+/* $OpenBSD: oldmon.h,v 1.6 2001/08/08 02:26:35 millert Exp $ */
/* $NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */
/*
@@ -234,8 +234,7 @@ struct om_vector {
long *resetMap; /* pgmap entry for resetaddr */
/* Really struct pgmapent * */
- __dead void (*exitToMon)
- __P((void)) __attribute__((__noreturn__));/* Exit from user program */
+ __dead void (*exitToMon) __P((void)); /* Exit from user program */
u_char **memorybitmap; /* V1: &{0 or &bits} */
void (*setcxsegmap) /* Set seg in any context */
__P((int, caddr_t, int));