summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/include/intr.h4
-rw-r--r--sys/arch/amd64/include/intr.h4
-rw-r--r--sys/arch/hppa/include/intr.h4
-rw-r--r--sys/arch/hppa64/include/cpu.h4
-rw-r--r--sys/arch/i386/include/intr.h4
-rw-r--r--sys/arch/m68k/include/psl.h4
-rw-r--r--sys/arch/m88k/include/intr.h4
-rw-r--r--sys/arch/sparc/include/psl.h4
-rw-r--r--sys/arch/sparc64/include/psl.h4
-rw-r--r--sys/arch/vax/include/intr.h4
10 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index b7c1fc7f2e0..6b021fdd1b8 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.27 2007/05/05 20:46:36 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.28 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
/*-
@@ -155,7 +155,7 @@ extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) \
do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index 9e4e0188241..a658b1c525d 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.9 2007/05/10 17:59:24 deraadt Exp $ */
+/* $OpenBSD: intr.h,v 1.10 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */
/*-
@@ -174,7 +174,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index f7a82352d58..fa2b3b61d4c 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.22 2007/05/14 19:54:21 martin Exp $ */
+/* $OpenBSD: intr.h,v 1.23 2007/05/16 19:37:06 thib Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -66,7 +66,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index b88a04dea2b..ddc35e3be5b 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.10 2007/03/15 10:22:29 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.11 2007/05/16 19:37:06 thib Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -149,7 +149,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index 90faf62a0bb..eeeb74a605e 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.30 2007/04/21 21:06:15 gwk Exp $ */
+/* $OpenBSD: intr.h,v 1.31 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */
/*
@@ -79,7 +79,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/m68k/include/psl.h b/sys/arch/m68k/include/psl.h
index 9fbbe9b3277..1b22332635e 100644
--- a/sys/arch/m68k/include/psl.h
+++ b/sys/arch/m68k/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.5 2006/06/11 20:46:50 miod Exp $ */
+/* $OpenBSD: psl.h,v 1.6 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: psl.h,v 1.5 1994/10/26 07:50:50 cgd Exp $ */
/*
@@ -83,7 +83,7 @@ extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) \
do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 2aaef73783e..0eb24b2076d 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.7 2006/03/13 19:39:52 brad Exp $ */
+/* $OpenBSD: intr.h,v 1.8 2007/05/16 19:37:06 thib Exp $ */
/*
* Copyright (C) 2000 Steve Murphree, Jr.
* All rights reserved.
@@ -45,7 +45,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 96418442bc9..1cd1b561797 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.22 2007/05/08 07:23:18 art Exp $ */
+/* $OpenBSD: psl.h,v 1.23 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
/*
@@ -169,7 +169,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index a8dcf4d57a0..1213314bae2 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.22 2006/12/14 15:10:32 kettenis Exp $ */
+/* $OpenBSD: psl.h,v 1.23 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -241,7 +241,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 13f53ac4a51..a3a3e76005b 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.7 2007/05/16 05:19:13 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.8 2007/05/16 19:37:06 thib Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -111,7 +111,7 @@ void splassert_fail(int, int, const char *);
extern int splassert_ctl;
void splassert_check(int, const char *);
#define splassert(__wantipl) do { \
- if (__predict_false(splassert_ctl > 0)) { \
+ if (splassert_ctl > 0) { \
splassert_check(__wantipl, __func__); \
} \
} while (0)