summaryrefslogtreecommitdiff
path: root/usr/src/head
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/head')
-rw-r--r--usr/src/head/Makefile3
-rw-r--r--usr/src/head/bhyve.h25
-rw-r--r--usr/src/head/string.h1
3 files changed, 2 insertions, 27 deletions
diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile
index 562664bde5..75e2788897 100644
--- a/usr/src/head/Makefile
+++ b/usr/src/head/Makefile
@@ -33,8 +33,7 @@ include ../Makefile.master
sparc_HDRS=
i386_HDRS= \
- stack_unwind.h \
- bhyve.h
+ stack_unwind.h
KRB5HDRS= \
mit_copyright.h \
diff --git a/usr/src/head/bhyve.h b/usr/src/head/bhyve.h
deleted file mode 100644
index 8c79ca1ccc..0000000000
--- a/usr/src/head/bhyve.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * COPYRIGHT 2013 Pluribus Networks Inc.
- *
- * All rights reserved. This copyright notice is Copyright Management
- * Information under 17 USC 1202 and is included to protect this work and
- * deter copyright infringement. Removal or alteration of this Copyright
- * Management Information without the express written permission from
- * Pluribus Networks Inc is prohibited, and any such unauthorized removal
- * or alteration will be a violation of federal law.
- */
-#ifndef _BHYVE_H
-#define _BHYVE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BHYVE_TMPDIR "/var/run/bhyve"
-#define BHYVE_CONS_SOCKPATH BHYVE_TMPDIR "/%s.console_sock"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BHYVE_H */
diff --git a/usr/src/head/string.h b/usr/src/head/string.h
index 1314fbbbb8..f75c14c59c 100644
--- a/usr/src/head/string.h
+++ b/usr/src/head/string.h
@@ -22,6 +22,7 @@
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2020 Joyent, Inc.
*/
/* Copyright (c) 1988 AT&T */