summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2014-03-11 19:45:29 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2014-03-11 19:45:29 +0000
commit0ea3222fb70c596dc5798f2e1db2b6698354ada9 (patch)
treef103b881a4bb2aeafe44ea5251ff8d61c5249e91 /sys/kern
parent24dc6033bb5e10e9a21d280b2d03080b5e7c06c2 (diff)
lint is gone, and the 'lint' conditional was never in the implementation
namespace, so stop changing behavior when it's #defined ok beck@ krw@
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/tty_conf.c7
-rw-r--r--sys/kern/uipc_domain.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index f63ef7e6d2d..a6066823afc 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_conf.c,v 1.17 2013/12/13 19:55:12 naddy Exp $ */
+/* $OpenBSD: tty_conf.c,v 1.18 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */
/*-
@@ -162,13 +162,8 @@ int nlinesw = sizeof (linesw) / sizeof (linesw[0]);
* Do nothing specific version of line
* discipline specific ioctl command.
*/
-/*ARGSUSED*/
int
nullioctl(struct tty *tp, u_long cmd, char *data, int flags, struct proc *p)
{
-
-#ifdef lint
- tp = tp; data = data; flags = flags; p = p;
-#endif
return (-1);
}
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 1be2d180fae..1095103c7c7 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_domain.c,v 1.34 2014/01/19 03:04:54 claudio Exp $ */
+/* $OpenBSD: uipc_domain.c,v 1.35 2014/03/11 19:45:28 guenther Exp $ */
/* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */
/*
@@ -78,7 +78,6 @@ domaininit(void)
* KAME NOTE: ADDDOMAIN(route) is moved to the last part so that
* it will be initialized as the *first* element. confusing!
*/
-#ifndef lint
ADDDOMAIN(unix);
#ifdef INET
ADDDOMAIN(inet);
@@ -101,7 +100,6 @@ domaininit(void)
ADDDOMAIN(bt);
#endif
ADDDOMAIN(route);
-#endif
for (dp = domains; dp; dp = dp->dom_next) {
if (dp->dom_init)