CVS commit: src/sys

[Kengo NAKAHARA]

Module Name:    src
Committed By:   knakahara
Date:           Fri Aug 28 07:18:40 UTC 2015

Modified Files:
        src/sys/kern: kern_stub.c
        src/sys/sys: systm.h

Log Message:
fix interrupt_* stubs. reported by skrll@n.o


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.267 -r1.268 src/sys/sys/systm.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/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.41 src/sys/kern/kern_stub.c:1.42
--- src/sys/kern/kern_stub.c:1.41	Mon Aug 24 22:50:32 2015
+++ src/sys/kern/kern_stub.c	Fri Aug 28 07:18:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_stub.c,v 1.41 2015/08/24 22:50:32 pooka Exp $	*/
+/*	$NetBSD: kern_stub.c,v 1.42 2015/08/28 07:18:39 knakahara Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.41 2015/08/24 22:50:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.42 2015/08/28 07:18:39 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ptrace.h"
@@ -149,12 +149,12 @@ __weak_alias(userconf_prompt, voidop);
 
 __weak_alias(kobj_renamespace, nullop);
 
-__weak_alias(interrupt_get_count, eopnotsupp);
-__weak_alias(interrupt_get_assigned, eopnotsupp);
-__weak_alias(interrupt_get_available, eopnotsupp);
-__weak_alias(interrupt_get_devname, eopnotsupp);
-__weak_alias(interrupt_construct_intrids, eopnotsupp);
-__weak_alias(interrupt_destruct_intrids, eopnotsupp);
+__weak_alias(interrupt_get_count, nullop);
+__weak_alias(interrupt_get_assigned, voidop);
+__weak_alias(interrupt_get_available, voidop);
+__weak_alias(interrupt_get_devname, voidop);
+__weak_alias(interrupt_construct_intrids, nullret);
+__weak_alias(interrupt_destruct_intrids, voidop);
 __weak_alias(interrupt_distribute, eopnotsupp);
 __weak_alias(interrupt_distribute_handler, eopnotsupp);
 
@@ -286,6 +286,16 @@ nullop(void *v)
 	return (0);
 }
 
+/*
+ * Generic null operation, always returns null.
+ */
+void *
+nullret(void)
+{
+
+	return (NULL);
+}
+
 bool
 default_bus_space_handle_is_equal(bus_space_tag_t t,
     bus_space_handle_t h1, bus_space_handle_t h2)

Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.267 src/sys/sys/systm.h:1.268
--- src/sys/sys/systm.h:1.267	Sat Mar  7 16:34:55 2015
+++ src/sys/sys/systm.h	Fri Aug 28 07:18:40 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: systm.h,v 1.267 2015/03/07 16:34:55 christos Exp $	*/
+/*	$NetBSD: systm.h,v 1.268 2015/08/28 07:18:40 knakahara Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
@@ -164,6 +164,7 @@ extern void (*v_putc)(int); /* Virtual c
  */
 void	voidop(void);
 int	nullop(void *);
+void*	nullret(void);
 int	enodev(void);
 int	enosys(void);
 int	enoioctl(void);