diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk
--- a/sys/tools/makeobjops.awk
+++ b/sys/tools/makeobjops.awk
@@ -325,18 +325,13 @@
 		    line_width, length(prototype)));
 	}
 	printh("{");
-	if (singleton)
-		printh("\tstatic kobjop_t _m;");
-	else
-		printh("\tkobjop_t _m;");
+	printh("\tkobjop_t _m;");
 	if (ret != "void")
 		printh("\t" ret " rc;");
 	if (!static)
 		firstvar = "((kobj_t)" firstvar ")";
 	if (prolog != "")
 		printh(prolog);
-	if (singleton)
-		printh("\tif (_m == NULL)");
 	printh("\tKOBJOPLOOKUP(" firstvar "->ops," mname ");");
 	rceq = (ret != "void") ? "rc = " : "";
 	printh("\t" rceq "((" mname "_t *) _m)(" varname_list ");");
@@ -458,7 +453,6 @@
 	lastdoc = "";
 	prolog = "";
 	epilog = "";
-	singleton = 0;
 
 	while (!error && (getline < src) > 0) {
 		lineno++;
@@ -503,8 +497,6 @@
 			prolog = handle_code();
 		else if (/^EPILOG[ 	]*{$/)
 			epilog = handle_code();
-		else if (/^SINGLETON/)
-			singleton = 1;
 		else {
 			debug($0);
 			warnsrc("Invalid line encountered");