diff --git a/Makefile b/Makefile index 11f44de2..5e3b92ee 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,6 @@ LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-rwlock.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-shell.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-shell-netcmds.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-signal.c -LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-subr_param.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-support.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-sx.c LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-syscall-api.c diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 953bb6d9..778d87da 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -633,7 +633,6 @@ rtems.addRTEMSSourceFiles( 'rtems/rtems-bsd-shell.c', 'rtems/rtems-bsd-shell-netcmds.c', 'rtems/rtems-bsd-signal.c', - 'rtems/rtems-bsd-subr_param.c', 'rtems/rtems-bsd-support.c', 'rtems/rtems-bsd-sx.c', 'rtems/rtems-bsd-syscall-api.c', diff --git a/freebsd/sys/sys/systm.h b/freebsd/sys/sys/systm.h index 75d8a49b..f809174e 100644 --- a/freebsd/sys/sys/systm.h +++ b/freebsd/sys/sys/systm.h @@ -75,7 +75,11 @@ extern int bootverbose; /* nonzero to print verbose messages */ extern int maxusers; /* system tune hint */ extern int ngroups_max; /* max # of supplemental groups */ +#ifndef __rtems__ extern int vm_guest; /* Running as virtual machine guest? */ +#else /* __rtems__ */ +#define vm_guest VM_GUEST_NO +#endif /* __rtems__ */ /* * Detected virtual machine guest types. The intention is to expand diff --git a/rtemsbsd/rtems/rtems-bsd-subr_param.c b/rtemsbsd/rtems/rtems-bsd-subr_param.c deleted file mode 100644 index efbd7384..00000000 --- a/rtemsbsd/rtems/rtems-bsd-subr_param.c +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file - * - * @ingroup rtems_bsd_rtems - * - * @brief This file is an rtems representation of needed methods - * and/or variables associated with the FreeBSD file subr_param.c - -/* - * COPYRIGHT (c) 2012. On-Line Applications Research Corporation (OAR). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -int vm_guest = 0;