Module Name: src
Committed By: matt
Date: Sun Aug 25 03:08:56 UTC 2013
Modified Files:
src/sys/arch/vax/include: types.h
src/sys/sys: intr.h
Log Message:
add #define __HAVE_MD_SOFTINT_TRIGGER to <vax/types.h>
Only define a function prototype for softint_trigger
if __HAVE_MD_SOFTINT_TRIGGER is undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/vax/include/types.h
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.46 src/sys/arch/vax/include/types.h:1.47
--- src/sys/arch/vax/include/types.h:1.46 Mon Jul 2 22:42:18 2012
+++ src/sys/arch/vax/include/types.h Sun Aug 25 03:08:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.46 2012/07/02 22:42:18 abs Exp $ */
+/* $NetBSD: types.h,v 1.47 2013/08/25 03:08:56 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -75,6 +75,7 @@ typedef volatile char __cpu_simple_lock_
#define __HAVE_DEVICE_REGISTER
#define __HAVE_SYSCALL_INTERN
#define __HAVE_FAST_SOFTINTS
+#define __HAVE_MD_SOFTINT_TRIGGER
#define __HAVE_CPU_DATA_FIRST
#define __HAVE_MM_MD_READWRITE
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/sys/intr.h
diff -u src/sys/sys/intr.h:1.15 src/sys/sys/intr.h:1.16
--- src/sys/sys/intr.h:1.15 Mon Aug 19 03:05:17 2013
+++ src/sys/sys/intr.h Sun Aug 25 03:08:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.15 2013/08/19 03:05:17 matt Exp $ */
+/* $NetBSD: intr.h,v 1.16 2013/08/25 03:08:56 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -51,7 +51,9 @@ void softint_block(lwp_t *);
/* MD-MI interface. */
void softint_init_md(lwp_t *, u_int, uintptr_t *);
+#ifndef __HAVE_MD_SOFTINT_TRIGGER
void softint_trigger(uintptr_t);
+#endif
void softint_dispatch(lwp_t *, int);
/* Flags for softint_establish(). */
