CVS commit: src/sys/arch/x86/x86

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Tue Oct 18 23:41:45 UTC 2011

Modified Files:
        src/sys/arch/x86/x86: x86_stub.c

Log Message:
Use the right return types for x86_nullop() and x86_zeroop().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/x86_stub.c

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/x86/x86/x86_stub.c
diff -u src/sys/arch/x86/x86/x86_stub.c:1.2 src/sys/arch/x86/x86/x86_stub.c:1.3
--- src/sys/arch/x86/x86/x86_stub.c:1.2	Tue Oct 18 23:25:20 2011
+++ src/sys/arch/x86/x86/x86_stub.c	Tue Oct 18 23:41:45 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: x86_stub.c,v 1.2 2011/10/18 23:25:20 dyoung Exp $ */
+/* $NetBSD: x86_stub.c,v 1.3 2011/10/18 23:41:45 dyoung Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_stub.c,v 1.2 2011/10/18 23:25:20 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_stub.c,v 1.3 2011/10/18 23:41:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -9,8 +9,8 @@ __KERNEL_RCSID(0, "$NetBSD: x86_stub.c,v
 
 #include <machine/autoconf.h>
 
-int x86_nullop(void);
-void *x86_zeroop(void);
+int x86_zeroop(void);
+void *x86_nullop(void);
 void x86_voidop(void);
 
 void
@@ -18,16 +18,16 @@ x86_voidop(void)
 {
 }
 
-int
+void *
 x86_nullop(void)
 {
-	return 0;
+	return NULL;
 }
 
-void *
+int
 x86_zeroop(void)
 {
-	return NULL;
+	return 0;
 }
 
 __weak_alias(device_pci_props_register, x86_voidop);