[Midnightbsd-cvs] src [10401] trunk/sys: fixup verion checks
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 23:42:03 EDT 2018
Revision: 10401
http://svnweb.midnightbsd.org/src/?rev=10401
Author: laffer1
Date: 2018-06-03 23:42:02 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
fixup verion checks
Modified Paths:
--------------
trunk/sys/boot/efi/include/amd64/efibind.h
trunk/sys/boot/efi/include/i386/efibind.h
trunk/sys/boot/efi/include/ia64/efibind.h
trunk/sys/cam/scsi/scsi_low_pisa.c
trunk/sys/cam/scsi/scsi_low_pisa.h
trunk/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
trunk/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
trunk/sys/cddl/dev/lockstat/lockstat.c
trunk/sys/cddl/dev/profile/profile.c
trunk/sys/compat/linux/linux_videodev2.h
trunk/sys/compat/svr4/svr4_misc.c
trunk/sys/crypto/sha2/sha2.c
trunk/sys/dev/aic7xxx/aic79xx.c
trunk/sys/dev/aic7xxx/aic7xxx.c
trunk/sys/dev/asr/i2oadptr.h
trunk/sys/dev/asr/i2obscsi.h
trunk/sys/dev/asr/i2oexec.h
trunk/sys/dev/asr/i2omsg.h
trunk/sys/dev/asr/i2otypes.h
trunk/sys/dev/asr/i2outil.h
trunk/sys/dev/asr/osd_defs.h
trunk/sys/dev/asr/osd_util.h
trunk/sys/dev/asr/sys_info.h
trunk/sys/dev/bktr/bktr_audio.c
trunk/sys/dev/bktr/bktr_card.c
trunk/sys/dev/bktr/bktr_core.c
trunk/sys/dev/bktr/bktr_os.c
trunk/sys/dev/bktr/bktr_os.h
trunk/sys/dev/bktr/bktr_reg.h
trunk/sys/dev/bktr/bktr_tuner.c
trunk/sys/dev/ce/ceddk.c
trunk/sys/dev/cx/machdep.h
trunk/sys/dev/drm/i915_drv.h
trunk/sys/dev/drm/i915_suspend.c
trunk/sys/dev/drm/mach64_dma.c
trunk/sys/dev/drm2/drm_fb_helper.c
trunk/sys/dev/drm2/radeon/radeon_fence.c
trunk/sys/dev/firewire/firewire.c
trunk/sys/dev/firewire/firewirereg.h
trunk/sys/dev/firewire/fwcrom.c
trunk/sys/dev/firewire/fwdev.c
trunk/sys/dev/firewire/fwdma.c
trunk/sys/dev/firewire/fwmem.c
trunk/sys/dev/firewire/fwohci.c
trunk/sys/dev/firewire/fwohci_pci.c
trunk/sys/dev/firewire/if_fwe.c
trunk/sys/dev/firewire/if_fwip.c
trunk/sys/dev/firewire/sbp.c
trunk/sys/dev/hptmv/global.h
trunk/sys/dev/isp/isp.c
trunk/sys/dev/isp/isp_library.c
trunk/sys/dev/isp/isp_library.h
trunk/sys/dev/isp/isp_target.c
trunk/sys/dev/isp/ispvar.h
trunk/sys/dev/ixl/if_ixl.c
trunk/sys/dev/lmc/if_lmc.c
trunk/sys/dev/lmc/if_lmc.h
trunk/sys/dev/malo/if_malo.c
trunk/sys/dev/malo/if_malo_pci.c
trunk/sys/dev/malo/if_malohal.c
trunk/sys/dev/mpr/mpi/mpi2_type.h
trunk/sys/dev/mps/mpi/mpi2_type.h
trunk/sys/dev/mpt/mpilib/mpi_type.h
trunk/sys/dev/mwl/if_mwl_pci.c
trunk/sys/dev/netmap/netmap.c
trunk/sys/dev/netmap/netmap_generic.c
trunk/sys/dev/netmap/netmap_kern.h
trunk/sys/dev/netmap/netmap_mbq.c
trunk/sys/dev/netmap/netmap_mem2.c
trunk/sys/dev/netmap/netmap_monitor.c
trunk/sys/dev/netmap/netmap_offloadings.c
trunk/sys/dev/netmap/netmap_pipe.c
trunk/sys/dev/netmap/netmap_vale.c
trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h
trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.c
trunk/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c
trunk/sys/dev/tpm/tpm.c
trunk/sys/dev/tpm/tpm_isa.c
trunk/sys/dev/tpm/tpmvar.h
trunk/sys/dev/twe/twe_compat.h
trunk/sys/dev/wi/if_wireg.h
trunk/sys/fs/nfs/nfs_var.h
trunk/sys/fs/nfsclient/nfs_clstate.c
trunk/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
trunk/sys/gnu/fs/xfs/xfs_types.h
trunk/sys/net/bpf.h
trunk/sys/net/if_atm.h
trunk/sys/net/if_spppfr.c
trunk/sys/net/zlib.c
trunk/sys/net/zlib.h
trunk/sys/net80211/ieee80211_action.c
trunk/sys/net80211/ieee80211_adhoc.c
trunk/sys/net80211/ieee80211_alq.c
trunk/sys/net80211/ieee80211_dfs.c
trunk/sys/net80211/ieee80211_hostap.c
trunk/sys/net80211/ieee80211_ht.c
trunk/sys/net80211/ieee80211_hwmp.c
trunk/sys/net80211/ieee80211_ioctl.h
trunk/sys/net80211/ieee80211_mesh.c
trunk/sys/net80211/ieee80211_monitor.c
trunk/sys/net80211/ieee80211_sta.c
trunk/sys/net80211/ieee80211_tdma.c
trunk/sys/net80211/ieee80211_var.h
trunk/sys/net80211/ieee80211_wds.c
trunk/sys/netinet/ipfw/dn_sched_qfq.c
trunk/sys/netinet/ipfw/ip_fw2.c
trunk/sys/netinet/ipfw/ip_fw_dynamic.c
trunk/sys/netinet/ipfw/ip_fw_log.c
trunk/sys/netinet/sctp_input.c
trunk/sys/netinet/sctp_pcb.c
trunk/sys/netinet/sctp_pcb.h
trunk/sys/netinet/sctp_structs.h
trunk/sys/netinet/sctp_uio.h
trunk/sys/netpfil/ipfw/dn_sched_qfq.c
trunk/sys/netpfil/ipfw/ip_fw2.c
trunk/sys/netpfil/ipfw/ip_fw_log.c
trunk/sys/netpfil/ipfw/test/dn_test.h
trunk/sys/netpfil/ipfw/test/test_dn_sched.c
trunk/sys/ofed/include/rdma/sdp_socket.h
trunk/sys/pci/ncr.c
trunk/sys/teken/demo/teken_demo.c
trunk/sys/teken/teken.c
Modified: trunk/sys/boot/efi/include/amd64/efibind.h
===================================================================
--- trunk/sys/boot/efi/include/amd64/efibind.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/boot/efi/include/amd64/efibind.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -29,7 +29,7 @@
#pragma pack()
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/stdint.h>
#else
//
@@ -80,7 +80,7 @@
#endif
#endif
#endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
//
// Basic EFI types of various widths
@@ -246,7 +246,7 @@
#endif // EFI_FW_NT
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define INTERFACE_DECL(x) struct x
#else
//
@@ -260,7 +260,7 @@
#else
#define INTERFACE_DECL(x) typedef struct x
#endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#ifdef _MSC_EXTENSIONS
#pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP
Modified: trunk/sys/boot/efi/include/i386/efibind.h
===================================================================
--- trunk/sys/boot/efi/include/i386/efibind.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/boot/efi/include/i386/efibind.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -29,7 +29,7 @@
#pragma pack()
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/stdint.h>
#else
//
@@ -80,7 +80,7 @@
#endif
#endif
#endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
//
// Basic EFI types of various widths
@@ -242,7 +242,7 @@
#endif // EFI_FW_NT
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define INTERFACE_DECL(x) struct x
#else
//
@@ -256,7 +256,7 @@
#else
#define INTERFACE_DECL(x) typedef struct x
#endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#ifdef _MSC_EXTENSIONS
#pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP
Modified: trunk/sys/boot/efi/include/ia64/efibind.h
===================================================================
--- trunk/sys/boot/efi/include/ia64/efibind.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/boot/efi/include/ia64/efibind.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -29,7 +29,7 @@
#pragma pack()
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/stdint.h>
#else
//
@@ -80,7 +80,7 @@
#endif
#endif
#endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
//
// Basic EFI types of various widths
@@ -203,7 +203,7 @@
(_if)->LoadInternal(type, name, entry)
// entry(NULL, ST)
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define INTERFACE_DECL(x) struct x
#else
//
Modified: trunk/sys/cam/scsi/scsi_low_pisa.c
===================================================================
--- trunk/sys/cam/scsi/scsi_low_pisa.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cam/scsi/scsi_low_pisa.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -117,7 +117,7 @@
}
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -165,4 +165,4 @@
DECLARE_MODULE(scsi_low, scsi_low_moduledata, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
MODULE_VERSION(scsi_low, 1);
MODULE_DEPEND(scsi_low, cam, 1, 1, 1);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
Modified: trunk/sys/cam/scsi/scsi_low_pisa.h
===================================================================
--- trunk/sys/cam/scsi/scsi_low_pisa.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cam/scsi/scsi_low_pisa.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -40,8 +40,8 @@
int scsi_low_notify_pisa(pisa_device_handle_t, pisa_event_t);
#endif /* __NetBSD__ */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
int scsi_low_activate_pisa(struct scsi_low_softc *, int);
int scsi_low_deactivate_pisa(struct scsi_low_softc *);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#endif /* !_SCSI_LOW_PISA_H_ */
Modified: trunk/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -45,7 +45,7 @@
#endif
#define skip_whitespace(p) while ((*(p) == ' ') || (*(p) == '\t')) p++
-#if defined(__FreeBSD__) && !defined(_KERNEL)
+#if defined(__MidnightBSD__) && !defined(_KERNEL)
/*
* libnvpair is the lowest commen denominator for ZFS related libraries,
* defining aok here makes it usable by all ZFS related libraries
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -612,7 +612,7 @@
va_list alist;
va_start(alist, format);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
vpanic(format, alist);
#else
dtrace_vpanic(format, alist);
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -234,7 +234,7 @@
static unsigned long tpoints_hash_size = FASTTRAP_TPOINTS_DEFAULT_SIZE;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
SYSCTL_DECL(_kern_dtrace);
SYSCTL_NODE(_kern_dtrace, OID_AUTO, fasttrap, CTLFLAG_RD, 0, "DTrace fasttrap parameters");
SYSCTL_UINT(_kern_dtrace_fasttrap, OID_AUTO, max_probes, CTLFLAG_RWTUN, &fasttrap_max,
@@ -1238,7 +1238,7 @@
* the chance to execute the trap instruction we're about to place
* in their process's text.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* pfind() returns a locked process.
*/
@@ -1317,7 +1317,7 @@
* DTrace consumers from disabling this probe.
*/
if ((p = pfind(probe->ftp_pid)) != NULL) {
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (p->p_flag & P_WEXIT) {
PROC_UNLOCK(p);
p = NULL;
@@ -1362,7 +1362,7 @@
if (whack)
fasttrap_pid_cleanup();
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (p != NULL)
PRELE(p);
#endif
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -364,7 +364,7 @@
static int sysctl_vfs_zfs_arc_max(SYSCTL_HANDLER_ARGS);
static int sysctl_vfs_zfs_arc_min(SYSCTL_HANDLER_ARGS);
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
static void
arc_free_target_init(void *unused __unused)
{
@@ -1039,7 +1039,7 @@
l1arc_buf_hdr_t b_l1hdr;
};
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
static int
sysctl_vfs_zfs_arc_meta_limit(SYSCTL_HANDLER_ARGS)
{
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -58,7 +58,7 @@
#include <sys/zfeature.h>
#include <sys/bqueue.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#undef dump_write
#define dump_write dmu_dump_write
#endif
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -973,7 +973,7 @@
return (dsobj);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/* FreeBSD ioctl compat begin */
struct destroyarg {
nvlist_t *nvl;
@@ -1011,7 +1011,7 @@
return (err);
}
/* FreeBSD ioctl compat end */
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
/*
* The unique space in the head dataset can be calculated by subtracting
@@ -1588,7 +1588,7 @@
fnvlist_free(suspended);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
if (error == 0) {
for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
@@ -2140,7 +2140,7 @@
dsl_dataset_rename_snapshot_sync_impl(dsl_pool_t *dp,
dsl_dataset_t *hds, void *arg)
{
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
char *oldname, *newname;
#endif
@@ -2173,7 +2173,7 @@
dsl_dataset_phys(hds)->ds_snapnames_zapobj,
ds->ds_snapname, 8, 1, &ds->ds_object, tx));
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
oldname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
newname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
@@ -2616,7 +2616,7 @@
dsl_dir_t *odd = NULL;
uint64_t oldnext_obj;
int64_t delta;
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
char *oldname, *newname;
#endif
@@ -2686,7 +2686,7 @@
dsl_dir_phys(dd)->dd_clones, origin_head->ds_object, tx));
}
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
/* Take the spa_namespace_lock early so zvol renames don't deadlock. */
mutex_enter(&spa_namespace_lock);
@@ -2728,7 +2728,7 @@
VERIFY0(dsl_dir_hold_obj(dp, dd->dd_object,
NULL, ds, &ds->ds_dir));
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
dsl_dataset_name(ds, newname);
zfsvfs_update_fromname(oldname, newname);
zvol_rename_minors(oldname, newname);
@@ -2772,7 +2772,7 @@
ASSERT(!dsl_prop_hascb(ds));
}
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
mutex_exit(&spa_namespace_lock);
kmem_free(newname, MAXPATHLEN);
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -707,7 +707,7 @@
prop == ZFS_PROP_SNAPSHOT_LIMIT);
#ifdef _KERNEL
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (jailed(cr))
#else
if (crgetzoneid(cr) != GLOBAL_ZONEID)
@@ -1908,7 +1908,7 @@
VERIFY0(zap_add(mos, dsl_dir_phys(newparent)->dd_child_dir_zapobj,
dd->dd_myname, 8, 1, &dd->dd_object, tx));
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
zfsvfs_update_fromname(ddra->ddra_oldname, ddra->ddra_newname);
zvol_rename_minors(ddra->ddra_oldname, ddra->ddra_newname);
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -49,7 +49,7 @@
#include <sys/zil_impl.h>
#include <sys/dsl_userhold.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
@@ -133,7 +133,7 @@
uint64_t zfs_delay_scale = 1000 * 1000 * 1000 / 2000;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
extern int zfs_vdev_async_write_active_max_dirty_percent;
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -3137,7 +3137,7 @@
spa->spa_last_ubsync_txg = 0;
spa->spa_load_txg = 0;
mutex_exit(&spa_namespace_lock);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
if (firstopen)
zvol_create_minors(spa->spa_name);
@@ -4445,7 +4445,7 @@
mutex_exit(&spa_namespace_lock);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
zvol_create_minors(pool);
#endif
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -625,7 +625,7 @@
++spa->spa_deadman_calls);
if (zfs_deadman_enabled)
vdev_deadman(spa->spa_root_vdev);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
callout_schedule(&spa->spa_deadman_cycid,
hz * zfs_deadman_checktime_ms / MILLISEC);
@@ -633,7 +633,7 @@
#endif
}
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
static void
spa_deadman_timeout(void *arg)
{
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -117,11 +117,11 @@
* Make sure it's a regular file.
*/
if (vp->v_type != VREG) {
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
(void) VOP_CLOSE(vp, spa_mode(vd->vdev_spa), 1, 0, kcred, NULL);
#endif
vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
kmem_free(vd->vdev_tsd, sizeof (vdev_file_t));
vd->vdev_tsd = NULL;
#endif
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -194,7 +194,7 @@
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#ifdef _KERNEL
SYSCTL_DECL(_vfs_zfs_vdev);
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -134,7 +134,7 @@
* distinguish between the operation failing, and
* deserialization failing.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include "opt_kstack_pages.h"
#endif
@@ -3323,7 +3323,7 @@
if (error != 0)
(void) dsl_destroy_head(fsname);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (error == 0 && type == DMU_OST_ZVOL)
zvol_create_minors(fsname);
#endif
@@ -3368,7 +3368,7 @@
if (error != 0)
(void) dsl_destroy_head(fsname);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (error == 0)
zvol_create_minors(fsname);
#endif
@@ -3477,7 +3477,7 @@
return (error);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
static int
zfs_ioc_nextboot(const char *unused, nvlist_t *innvl, nvlist_t *outnvl)
{
@@ -3642,7 +3642,7 @@
error = zfs_unmount_snap(name);
if (error != 0)
return (error);
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
zvol_remove_minors(name);
#endif
}
@@ -3768,7 +3768,7 @@
else
err = dsl_destroy_head(zc->zc_name);
if (zc->zc_objset_type == DMU_OST_ZVOL && err == 0)
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
zvol_remove_minors(zc->zc_name);
#else
(void) zvol_remove_minor(zc->zc_name);
@@ -3839,7 +3839,7 @@
char *at;
boolean_t allow_mounted = B_TRUE;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
allow_mounted = (zc->zc_cookie & 2) != 0;
#endif
@@ -4519,7 +4519,7 @@
}
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (error == 0)
zvol_create_minors(tofs);
#endif
@@ -6087,7 +6087,7 @@
zfs_ioc_tmp_snapshot, zfs_secpolicy_tmp_snapshot,
POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
zfs_ioctl_register_dataset_nolog(ZFS_IOC_JAIL, zfs_ioc_jail,
zfs_secpolicy_config, POOL_CHECK_NONE);
zfs_ioctl_register_dataset_nolog(ZFS_IOC_UNJAIL, zfs_ioc_unjail,
@@ -6774,7 +6774,7 @@
static eventhandler_tag zfs_shutdown_event_tag;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define ZFS_MIN_KSTACK_PAGES 4
#endif
@@ -6782,7 +6782,7 @@
zfs__init(void)
{
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#if KSTACK_PAGES < ZFS_MIN_KSTACK_PAGES
printf("ZFS NOTICE: KSTACK_PAGES is %d which could result in stack "
"overflow panic!\nPlease consider adding "
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -802,11 +802,11 @@
nbytes = MIN(n, zfs_read_chunk_size -
P2PHASE(uio->uio_loffset, zfs_read_chunk_size));
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (uio->uio_segflg == UIO_NOCOPY)
error = mappedread_sf(vp, nbytes, uio);
else
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
if (vn_has_cached_data(vp)) {
error = mappedread(vp, nbytes, uio);
} else {
@@ -1225,7 +1225,7 @@
return (error);
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* EFAULT means that at least one page of the source buffer was not
* available. VFS will re-try remaining I/O upon this error.
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1139,7 +1139,7 @@
doi.doi_bonus_size < sizeof (znode_phys_t)))) {
sa_buf_rele(db, NULL);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
getnewvnode_drop_reserve();
#endif
return (SET_ERROR(EINVAL));
Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -33,7 +33,7 @@
#include <sys/param.h>
#include <sys/isa_defs.h>
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
#include <sys/libkern.h>
#endif
@@ -386,7 +386,7 @@
static __inline int
highbit(ulong_t i)
{
-#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
+#if defined(__MidnightBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
return (flsl(i));
#else
int h = 1;
@@ -424,7 +424,7 @@
static __inline int
highbit64(uint64_t i)
{
-#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSLL)
+#if defined(__MidnightBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSLL)
return (flsll(i));
#else
int h = 1;
Modified: trunk/sys/cddl/dev/lockstat/lockstat.c
===================================================================
--- trunk/sys/cddl/dev/lockstat/lockstat.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/dev/lockstat/lockstat.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -67,12 +67,12 @@
char *lsp_name;
int lsp_probe;
dtrace_id_t lsp_id;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
int lsp_frame;
#endif
} lockstat_probe_t;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
lockstat_probe_t lockstat_probes[] =
{
/* Spin Locks */
@@ -233,7 +233,7 @@
continue;
ASSERT(!probe->lsp_id);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
probe->lsp_id = dtrace_probe_create(lockstat_id,
"kernel", probe->lsp_func, probe->lsp_name,
probe->lsp_frame, probe);
Modified: trunk/sys/cddl/dev/profile/profile.c
===================================================================
--- trunk/sys/cddl/dev/profile/profile.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/cddl/dev/profile/profile.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -148,7 +148,7 @@
hrtime_t profc_expected;
hrtime_t profc_interval;
profile_probe_t *profc_probe;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
struct callout profc_cyclic;
#endif
} profile_probe_percpu_t;
Modified: trunk/sys/compat/linux/linux_videodev2.h
===================================================================
--- trunk/sys/compat/linux/linux_videodev2.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/compat/linux/linux_videodev2.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -22,7 +22,7 @@
* Justin Schoeman
* et al.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define __user
typedef uint64_t __u64;
typedef int64_t __s64;
Modified: trunk/sys/compat/svr4/svr4_misc.c
===================================================================
--- trunk/sys/compat/svr4/svr4_misc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/compat/svr4/svr4_misc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -89,7 +89,7 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_map.h>
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <vm/uma.h>
#include <vm/vm_extern.h>
#endif
Modified: trunk/sys/crypto/sha2/sha2.c
===================================================================
--- trunk/sys/crypto/sha2/sha2.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/crypto/sha2/sha2.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -67,7 +67,7 @@
*
*/
-#if defined(__bsdi__) || defined(__FreeBSD__)
+#if defined(__bsdi__) || defined(__MidnightBSD__)
#define assert(x)
#endif
Modified: trunk/sys/dev/aic7xxx/aic79xx.c
===================================================================
--- trunk/sys/dev/aic7xxx/aic79xx.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/aic7xxx/aic79xx.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -2266,7 +2266,7 @@
printerror = 0;
} else if (ahd_sent_msg(ahd, AHDMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) {
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* Don't mark the user's request for this BDR
* as completing with CAM_BDR_SENT. CAM3
@@ -5271,7 +5271,7 @@
{
struct ahd_softc *ahd;
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
ahd = malloc(sizeof(*ahd), M_DEVBUF, M_NOWAIT);
if (!ahd) {
printf("aic7xxx: cannot malloc softc!\n");
@@ -5285,7 +5285,7 @@
ahd->seep_config = malloc(sizeof(*ahd->seep_config),
M_DEVBUF, M_NOWAIT);
if (ahd->seep_config == NULL) {
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
free(ahd, M_DEVBUF);
#endif
free(name, M_DEVBUF);
@@ -5473,7 +5473,7 @@
free(ahd->seep_config, M_DEVBUF);
if (ahd->saved_stack != NULL)
free(ahd->saved_stack, M_DEVBUF);
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
free(ahd, M_DEVBUF);
#endif
return;
Modified: trunk/sys/dev/aic7xxx/aic7xxx.c
===================================================================
--- trunk/sys/dev/aic7xxx/aic7xxx.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/aic7xxx/aic7xxx.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1280,7 +1280,7 @@
printerror = 0;
} else if (ahc_sent_msg(ahc, AHCMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) {
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* Don't mark the user's request for this BDR
* as completing with CAM_BDR_SENT. CAM3
@@ -3903,7 +3903,7 @@
struct ahc_softc *ahc;
int i;
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
ahc = malloc(sizeof(*ahc), M_DEVBUF, M_NOWAIT);
if (!ahc) {
printf("aic7xxx: cannot malloc softc!\n");
@@ -3917,7 +3917,7 @@
ahc->seep_config = malloc(sizeof(*ahc->seep_config),
M_DEVBUF, M_NOWAIT);
if (ahc->seep_config == NULL) {
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
free(ahc, M_DEVBUF);
#endif
free(name, M_DEVBUF);
@@ -4112,7 +4112,7 @@
free(ahc->name, M_DEVBUF);
if (ahc->seep_config != NULL)
free(ahc->seep_config, M_DEVBUF);
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
free(ahc, M_DEVBUF);
#endif
return;
Modified: trunk/sys/dev/asr/i2oadptr.h
===================================================================
--- trunk/sys/dev/asr/i2oadptr.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2oadptr.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -85,7 +85,7 @@
#if !defined(I2O_ADPTR_HDR)
#define I2O_ADPTR_HDR
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/pci/i2omsg.h"
# else
Modified: trunk/sys/dev/asr/i2obscsi.h
===================================================================
--- trunk/sys/dev/asr/i2obscsi.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2obscsi.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -85,7 +85,7 @@
#if !defined(I2O_BASE_SCSI_HDR)
#define I2O_BASE_SCSI_HDR
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/pci/i2omsg.h" /* Include the Base Message file */
# else
Modified: trunk/sys/dev/asr/i2oexec.h
===================================================================
--- trunk/sys/dev/asr/i2oexec.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2oexec.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -94,7 +94,7 @@
#define I2OEXEC_REV 1_5_4 /* I2OExec header file revision string */
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (!defined(KERN_VERSION))
# include <sys/sysctl.h>
# endif
Modified: trunk/sys/dev/asr/i2omsg.h
===================================================================
--- trunk/sys/dev/asr/i2omsg.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2omsg.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -118,7 +118,7 @@
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/pci/i2otypes.h"
# else
Modified: trunk/sys/dev/asr/i2otypes.h
===================================================================
--- trunk/sys/dev/asr/i2otypes.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2otypes.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -89,7 +89,7 @@
/* include architecture/compiler dependencies */
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/pci/i2odep.h"
# else
Modified: trunk/sys/dev/asr/i2outil.h
===================================================================
--- trunk/sys/dev/asr/i2outil.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/i2outil.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -94,7 +94,7 @@
#define I2OUTIL_REV 1_5_4 /* I2OUtil header file revision string */
-#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#if ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/pci/i2omsg.h" /* Include the Base Message file */
# else
Modified: trunk/sys/dev/asr/osd_defs.h
===================================================================
--- trunk/sys/dev/asr/osd_defs.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/osd_defs.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -57,7 +57,7 @@
# define _DPT_LINUX
#elif (defined(__bsdi__))
# define _DPT_BSDI
-#elif (defined(__FreeBSD__))
+#elif (defined(__MidnightBSD__))
# undef _DPT_FREE_BSD
# define _DPT_FREE_BSD
#else
Modified: trunk/sys/dev/asr/osd_util.h
===================================================================
--- trunk/sys/dev/asr/osd_util.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/osd_util.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -79,7 +79,7 @@
#if (defined(KERNEL) && defined(__bsdi__))
# include "i386/isa/dpt_osd_defs.h"
-#elif ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#elif ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/isa/dpt_osd_defs.h"
# else
Modified: trunk/sys/dev/asr/sys_info.h
===================================================================
--- trunk/sys/dev/asr/sys_info.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/asr/sys_info.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -54,7 +54,7 @@
#if (defined(KERNEL) && defined(__bsdi__))
# include "i386/isa/dpt_osd_util.h"
-#elif ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__))
+#elif ((defined(KERNEL) || defined(_KERNEL)) && defined(__MidnightBSD__))
# if (KERN_VERSION < 3)
# include "i386/isa/dpt_osd_util.h"
# else
Modified: trunk/sys/dev/bktr/bktr_audio.c
===================================================================
--- trunk/sys/dev/bktr/bktr_audio.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_audio.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -55,7 +55,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#if (__FreeBSD_version < 500000)
#include <machine/clock.h> /* for DELAY */
Modified: trunk/sys/dev/bktr/bktr_card.c
===================================================================
--- trunk/sys/dev/bktr/bktr_card.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_card.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -53,7 +53,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#if (__FreeBSD_version < 500000)
#include <machine/clock.h> /* for DELAY */
Modified: trunk/sys/dev/bktr/bktr_core.c
===================================================================
--- trunk/sys/dev/bktr/bktr_core.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_core.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -93,7 +93,7 @@
#include "opt_bktr.h" /* Include any kernel config options */
#if ( \
- (defined(__FreeBSD__)) \
+ (defined(__MidnightBSD__)) \
|| (defined(__bsdi__)) \
|| (defined(__OpenBSD__)) \
|| (defined(__NetBSD__)) \
@@ -103,7 +103,7 @@
/*******************/
/* *** FreeBSD *** */
/*******************/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@
}
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
/****************/
@@ -492,7 +492,7 @@
buf = 0;
#endif
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if defined(__MidnightBSD__) || defined(__bsdi__)
/* If this is a module, check if there is any currently saved contiguous memory */
#if defined(BKTR_FREEBSD_MODULE)
@@ -612,7 +612,7 @@
bktr->msp_source_selected = -1;
bktr->audio_mux_present = 1;
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#ifdef BKTR_NEW_MSP34XX_DRIVER
/* get hint on short programming of the msp34xx, so we know */
/* if the decision what thread to start should be overwritten */
Modified: trunk/sys/dev/bktr/bktr_os.c
===================================================================
--- trunk/sys/dev/bktr/bktr_os.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_os.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -56,7 +56,7 @@
/*******************/
/* *** FreeBSD *** */
/*******************/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/dev/bktr/bktr_os.h
===================================================================
--- trunk/sys/dev/bktr/bktr_os.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_os.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -48,7 +48,7 @@
/******************************/
/* *** Memory Allocation *** */
/******************************/
-#if (defined(__FreeBSD__) || defined(__bsdi__))
+#if (defined(__MidnightBSD__) || defined(__bsdi__))
vm_offset_t get_bktr_mem( int unit, unsigned size );
#endif
@@ -60,7 +60,7 @@
/************************************/
/* *** Interrupt Enable/Disable *** */
/************************************/
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#if (__FreeBSD_version >=500000)
#define USE_VBIMUTEX
#define DECLARE_INTR_MASK(s) /* no need to declare 's' */
Modified: trunk/sys/dev/bktr/bktr_reg.h
===================================================================
--- trunk/sys/dev/bktr/bktr_reg.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_reg.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -51,7 +51,7 @@
* Support the older kernel options on FreeBSD and OpenBSD.
*
*/
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__MidnightBSD__) || defined(__OpenBSD__)
#if defined(BROOKTREE_ALLOC_PAGES)
#define BKTR_ALLOC_PAGES BROOKTREE_ALLOC_PAGES
#endif
@@ -462,7 +462,7 @@
* memory mapped structure method only works on 32 bit processors
* with the right type of endianness.
*/
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__MidnightBSD__)
#define INB(bktr,offset) bus_space_read_1((bktr)->memt,(bktr)->memh,(offset))
#define INW(bktr,offset) bus_space_read_2((bktr)->memt,(bktr)->memh,(offset))
#define INL(bktr,offset) bus_space_read_4((bktr)->memt,(bktr)->memh,(offset))
@@ -525,7 +525,7 @@
vm_offset_t phys_base; /* Bt848 register physical address */
#endif
-#if defined (__FreeBSD__)
+#if defined (__MidnightBSD__)
int mem_rid; /* 4.x resource id */
struct resource *res_mem; /* 4.x resource descriptor for registers */
int irq_rid; /* 4.x resource id */
@@ -718,7 +718,7 @@
/* ioctl_cmd_t int on old versions, u_long on new versions */
/***********************************************************/
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
typedef u_long ioctl_cmd_t;
#endif
Modified: trunk/sys/dev/bktr/bktr_tuner.c
===================================================================
--- trunk/sys/dev/bktr/bktr_tuner.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/bktr/bktr_tuner.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -51,7 +51,7 @@
#include <sys/proc.h>
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#if (__FreeBSD_version < 500000)
#include <machine/clock.h> /* for DELAY */
#include <pci/pcivar.h>
Modified: trunk/sys/dev/ce/ceddk.c
===================================================================
--- trunk/sys/dev/ce/ceddk.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/ce/ceddk.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -24,7 +24,7 @@
#undef CE_DDK_DEBUG_ENABLED
#ifdef CE_DDK_DEBUG_ENABLED
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
# define CE_DDK_DEBUG(b,c,s) \
do { \
if (c) { \
Modified: trunk/sys/dev/cx/machdep.h
===================================================================
--- trunk/sys/dev/cx/machdep.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/cx/machdep.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -69,7 +69,7 @@
/*
* FreeBSD and BSD/OS
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
# include <sys/param.h>
# include <machine/cpufunc.h>
# include <sys/libkern.h>
Modified: trunk/sys/dev/drm/i915_drv.h
===================================================================
--- trunk/sys/dev/drm/i915_drv.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/drm/i915_drv.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -561,7 +561,7 @@
LOCK_TEST_WITH_RETURN(dev, file_priv); \
} while (0)
-#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined)
+#if defined(__MidnightBSD__) && !defined(__bool_true_false_are_defined)
typedef boolean_t bool;
#endif
Modified: trunk/sys/dev/drm/i915_suspend.c
===================================================================
--- trunk/sys/dev/drm/i915_suspend.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/drm/i915_suspend.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -234,7 +234,7 @@
struct drm_i915_private *dev_priv = dev->dev_private;
int i;
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
dev_priv->saveLBB = (u8) pci_read_config(dev->device, LBB, 1);
#else
pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
@@ -370,7 +370,7 @@
struct drm_i915_private *dev_priv = dev->dev_private;
int i;
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
pci_write_config(dev->device, LBB, dev_priv->saveLBB, 1);
#else
pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
Modified: trunk/sys/dev/drm/mach64_dma.c
===================================================================
--- trunk/sys/dev/drm/mach64_dma.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/drm/mach64_dma.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -790,12 +790,12 @@
/* FIXME: get a dma buffer from the freelist here */
DRM_DEBUG("Allocating data memory ...\n");
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
DRM_UNLOCK();
#endif
cpu_addr_dmah =
drm_pci_alloc(dev, 0x1000, 0x1000, 0xfffffffful);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
DRM_LOCK();
#endif
if (!cpu_addr_dmah) {
Modified: trunk/sys/dev/drm2/drm_fb_helper.c
===================================================================
--- trunk/sys/dev/drm2/drm_fb_helper.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/drm2/drm_fb_helper.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -841,7 +841,7 @@
struct fb_info *info;
struct drm_fb_helper_surface_size sizes;
int gamma_size = 0;
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
device_t kdev;
#endif
@@ -926,7 +926,7 @@
for (i = 0; i < fb_helper->crtc_count; i++)
fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
if (new_fb) {
device_t fbd;
int ret;
Modified: trunk/sys/dev/drm2/radeon/radeon_fence.c
===================================================================
--- trunk/sys/dev/drm2/radeon/radeon_fence.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/drm2/radeon/radeon_fence.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -344,7 +344,7 @@
ring, seq);
if (unlikely(!signaled)) {
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* we were interrupted for some reason and fence
* isn't signaled yet, resume waiting */
if (r) {
@@ -543,7 +543,7 @@
ring, target_seq[ring]);
if (unlikely(!signaled)) {
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* we were interrupted for some reason and fence
* isn't signaled yet, resume waiting */
if (r) {
Modified: trunk/sys/dev/firewire/firewire.c
===================================================================
--- trunk/sys/dev/firewire/firewire.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/firewire.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -2411,19 +2411,19 @@
fw_modevent(module_t mode, int type, void *data)
{
int err = 0;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
static eventhandler_tag fwdev_ehtag = NULL;
#endif
switch (type) {
case MOD_LOAD:
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
fwdev_ehtag = EVENTHANDLER_REGISTER(dev_clone,
fwdev_clone, 0, 1000);
#endif
break;
case MOD_UNLOAD:
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
if (fwdev_ehtag != NULL)
EVENTHANDLER_DEREGISTER(dev_clone, fwdev_ehtag);
#endif
Modified: trunk/sys/dev/firewire/firewirereg.h
===================================================================
--- trunk/sys/dev/firewire/firewirereg.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/firewirereg.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -76,7 +76,7 @@
};
struct firewire_softc {
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
struct cdev *dev;
#endif
struct firewire_comm *fc;
Modified: trunk/sys/dev/firewire/fwcrom.c
===================================================================
--- trunk/sys/dev/firewire/fwcrom.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwcrom.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/firewire/fwcrom.c 196970 2009-09-08 13:19:05Z phk $");
#endif
Modified: trunk/sys/dev/firewire/fwdev.c
===================================================================
--- trunk/sys/dev/firewire/fwdev.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwdev.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -208,7 +208,7 @@
if (dev->si_drv1 == NULL)
return (ENOMEM);
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
if ((dev->si_flags & SI_NAMED) == 0) {
int unit = DEV2UNIT(dev);
int sub = DEV2SUB(dev);
@@ -956,7 +956,7 @@
return (err);
}
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
#define NDEVTYPE 2
void
fwdev_clone(void *arg, struct ucred *cred, char *name, int namelen,
Modified: trunk/sys/dev/firewire/fwdma.c
===================================================================
--- trunk/sys/dev/firewire/fwdma.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwdma.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -34,7 +34,7 @@
*
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/firewire/fwdma.c 170374 2007-06-06 14:31:36Z simokawa $");
#endif
@@ -44,7 +44,7 @@
#include <sys/types.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
#include <sys/lock.h>
#include <sys/mutex.h>
#endif
@@ -91,7 +91,7 @@
/*nsegments*/ 1,
/*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
/*flags*/ BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
/*lockfunc*/busdma_lock_mutex,
/*lockarg*/FW_GMTX(fc),
#endif
@@ -189,7 +189,7 @@
/*nsegments*/ 1,
/*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
/*flags*/ BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
/*lockfunc*/busdma_lock_mutex,
/*lockarg*/FW_GMTX(fc),
#endif
Modified: trunk/sys/dev/firewire/fwmem.c
===================================================================
--- trunk/sys/dev/firewire/fwmem.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwmem.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -34,7 +34,7 @@
*
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/firewire/fwmem.c 227309 2011-11-07 15:43:11Z ed $");
#endif
Modified: trunk/sys/dev/firewire/fwohci.c
===================================================================
--- trunk/sys/dev/firewire/fwohci.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwohci.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1256,7 +1256,7 @@
/*nsegments*/ dbch->ndesc > 3 ? dbch->ndesc - 2 : 1,
/*maxsegsz*/ MAX_REQCOUNT,
/*flags*/ 0,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
/*lockfunc*/busdma_lock_mutex,
/*lockarg*/FW_GMTX(&sc->fc),
#endif
Modified: trunk/sys/dev/firewire/fwohci_pci.c
===================================================================
--- trunk/sys/dev/firewire/fwohci_pci.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/fwohci_pci.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -47,7 +47,7 @@
#include <machine/bus.h>
#include <sys/rman.h>
#include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
#include <sys/lock.h>
#include <sys/mutex.h>
#endif
@@ -356,7 +356,7 @@
}
err = bus_dma_tag_create(
-#if defined(__FreeBSD__) && __FreeBSD_version >= 700020
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 700020
/*parent*/bus_get_dma_tag(self),
#else
/*parent*/NULL,
@@ -374,7 +374,7 @@
/*nsegments*/0x20,
/*maxsegsz*/0x8000,
/*flags*/BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
/*lockfunc*/busdma_lock_mutex,
/*lockarg*/FW_GMTX(&sc->fc),
#endif
Modified: trunk/sys/dev/firewire/if_fwe.c
===================================================================
--- trunk/sys/dev/firewire/if_fwe.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/if_fwe.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -228,7 +228,7 @@
/* Tell the upper layer(s) we support long frames. */
ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_POLLING;
ifp->if_capenable |= IFCAP_VLAN_MTU;
#endif
@@ -274,7 +274,7 @@
fwe->dma_ch = -1;
}
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
#else
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
@@ -383,7 +383,7 @@
if ((xferq->flag & FWXFERQ_RUNNING) == 0)
fc->irx_enable(fc, fwe->dma_ch);
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
#else
@@ -409,7 +409,7 @@
case SIOCSIFFLAGS:
s = splimp();
if (ifp->if_flags & IFF_UP) {
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
#else
if (!(ifp->if_flags & IFF_RUNNING))
@@ -416,7 +416,7 @@
#endif
fwe_init(&fwe->eth_softc);
} else {
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
#else
if (ifp->if_flags & IFF_RUNNING)
@@ -471,7 +471,7 @@
}
#endif /* DEVICE_POLLING */
break;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
default:
#else
case SIOCSIFADDR:
@@ -545,7 +545,7 @@
}
s = splimp();
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
#else
ifp->if_flags |= IFF_OACTIVE;
@@ -554,7 +554,7 @@
if (ifp->if_snd.ifq_len != 0)
fwe_as_output(fwe, ifp);
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
#else
ifp->if_flags &= ~IFF_OACTIVE;
Modified: trunk/sys/dev/firewire/if_fwip.c
===================================================================
--- trunk/sys/dev/firewire/if_fwip.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/if_fwip.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -257,7 +257,7 @@
fwip->dma_ch = -1;
}
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
#else
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
@@ -382,7 +382,7 @@
if ((xferq->flag & FWXFERQ_RUNNING) == 0)
fc->irx_enable(fc, fwip->dma_ch);
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
#else
@@ -406,7 +406,7 @@
case SIOCSIFFLAGS:
s = splimp();
if (ifp->if_flags & IFF_UP) {
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
#else
if (!(ifp->if_flags & IFF_RUNNING))
@@ -413,7 +413,7 @@
#endif
fwip_init(&fwip->fw_softc);
} else {
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
#else
if (ifp->if_flags & IFF_RUNNING)
@@ -455,7 +455,7 @@
}
#endif /* DEVICE_POLLING */
break;
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
default:
#else
case SIOCSIFADDR:
@@ -561,7 +561,7 @@
}
s = splimp();
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
#else
ifp->if_flags |= IFF_OACTIVE;
@@ -570,7 +570,7 @@
if (ifp->if_snd.ifq_len != 0)
fwip_async_output(fwip, ifp);
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
#else
ifp->if_flags &= ~IFF_OACTIVE;
Modified: trunk/sys/dev/firewire/sbp.c
===================================================================
--- trunk/sys/dev/firewire/sbp.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/firewire/sbp.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -44,7 +44,7 @@
#include <sys/sysctl.h>
#include <machine/bus.h>
#include <sys/malloc.h>
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
#include <sys/lock.h>
#include <sys/mutex.h>
#endif
@@ -1977,7 +1977,7 @@
/*maxsize*/0x100000, /*nsegments*/SBP_IND_MAX,
/*maxsegsz*/SBP_SEG_MAX,
/*flags*/BUS_DMA_ALLOCNOW,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 501102
/*lockfunc*/busdma_lock_mutex,
/*lockarg*/&sbp->mtx,
#endif
@@ -2516,7 +2516,7 @@
device_get_nameunit(sbp->fd.dev),
cam_sim_path(sbp->sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+#if defined(__MidnightBSD__) && __FreeBSD_version >= 500000
(uintmax_t)
#endif
ccg->volume_size);
Modified: trunk/sys/dev/hptmv/global.h
===================================================================
--- trunk/sys/dev/hptmv/global.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/hptmv/global.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -205,7 +205,7 @@
#include <dev/hptmv/raid5n.h>
#include <dev/hptmv/vdevice.h>
-#if defined(__FreeBSD__) && defined(HPTLIBAPI)
+#if defined(__MidnightBSD__) && defined(HPTLIBAPI)
#undef HPTLIBAPI
#define HPTLIBAPI
#endif
Modified: trunk/sys/dev/isp/isp.c
===================================================================
--- trunk/sys/dev/isp/isp.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/isp/isp.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -46,7 +46,7 @@
__KERNEL_RCSID(0, "$NetBSD$");
#include <dev/ic/isp_netbsd.h>
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp.c 321945 2017-08-02 20:24:28Z ken $");
#include <dev/isp/isp_freebsd.h>
Modified: trunk/sys/dev/isp/isp_library.c
===================================================================
--- trunk/sys/dev/isp/isp_library.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/isp/isp_library.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -34,7 +34,7 @@
__KERNEL_RCSID(0, "$NetBSD$");
#include <dev/ic/isp_netbsd.h>
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_library.c 317366 2017-04-24 11:21:32Z mav $");
#include <dev/isp/isp_freebsd.h>
Modified: trunk/sys/dev/isp/isp_library.h
===================================================================
--- trunk/sys/dev/isp/isp_library.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/isp/isp_library.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -152,7 +152,7 @@
#ifdef ISP_TARGET_MODE
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <dev/ic/isp_target.h>
-#elif defined(__FreeBSD__)
+#elif defined(__MidnightBSD__)
#include <dev/isp/isp_target.h>
#else
#include "isp_target.h"
Modified: trunk/sys/dev/isp/isp_target.c
===================================================================
--- trunk/sys/dev/isp/isp_target.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/isp/isp_target.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -40,7 +40,7 @@
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_target.c 316173 2017-03-29 19:25:42Z mav $");
#include <dev/isp/isp_freebsd.h>
Modified: trunk/sys/dev/isp/ispvar.h
===================================================================
--- trunk/sys/dev/isp/ispvar.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/isp/ispvar.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -38,7 +38,7 @@
#include <dev/ic/isp_stds.h>
#include <dev/ic/ispmbox.h>
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <dev/isp/isp_stds.h>
#include <dev/isp/ispmbox.h>
#endif
Modified: trunk/sys/dev/ixl/if_ixl.c
===================================================================
--- trunk/sys/dev/ixl/if_ixl.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/ixl/if_ixl.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -4576,7 +4576,7 @@
{
u64 new_data;
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 1000000) && defined(__amd64__)
+#if defined(__MidnightBSD__) && defined(__amd64__)
new_data = rd64(hw, loreg);
#else
/*
Modified: trunk/sys/dev/lmc/if_lmc.c
===================================================================
--- trunk/sys/dev/lmc/if_lmc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/lmc/if_lmc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -72,7 +72,7 @@
*
* Send bug reports and improvements to <boggs at boggs.palo-alto.ca.us>.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
# include <sys/param.h> /* OS version */
# define IFNET 1
# include "opt_inet.h" /* INET */
@@ -147,7 +147,7 @@
# endif
/* and finally... */
# include <dev/lmc/if_lmc.h>
-#endif /*__FreeBSD__*/
+#endif /*__MidnightBSD__*/
#ifdef __NetBSD__
# include <sys/param.h> /* OS version */
@@ -2487,7 +2487,7 @@
#if IFNET
-# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\
+# if ((defined(__MidnightBSD__) && (__FreeBSD_version < 500000)) ||\
defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__))
static void
netisr_dispatch(int isr, struct mbuf *mbuf)
@@ -2519,7 +2519,7 @@
IF_DROP(intrq);
}
}
-# endif /* ((__FreeBSD__ && (__FreeBSD_version < 500000)) || */
+# endif /* ((__MidnightBSD__ && (__FreeBSD_version < 500000)) || */
/* __NetBSD__ || __OpenBSD__ || __bsdi__) */
/* rxintr_cleanup calls this to give a newly arrived pkt to higher levels. */
@@ -2592,7 +2592,7 @@
return m;
}
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
static void /* *** FreeBSD ONLY *** Callout from bus_dmamap_load() */
fbsd_dmamap_load(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
{
@@ -2619,7 +2619,7 @@
return EINVAL;
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/* Create a DMA tag for descriptors and buffers. */
if ((error = bus_dma_tag_create(bus_get_dma_tag(sc->dev),
@@ -2764,7 +2764,7 @@
if (ring->read++ == ring->last) ring->read = ring->first;
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/* Free the dmamaps of all DMA descriptors. */
for (desc=ring->first; desc!=ring->last+1; desc++)
@@ -2820,7 +2820,7 @@
struct mbuf *new_mbuf;
int pkt_len, desc_len;
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
/* Input packet flow control (livelock prevention): */
/* Give pkts to higher levels only if quota is > 0. */
if (sc->quota <= 0) return 0;
@@ -2936,7 +2936,7 @@
sc->ifp->if_ipackets++;
LMC_BPF_MTAP(first_mbuf);
#endif
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
sc->quota--;
#endif
@@ -3052,7 +3052,7 @@
DMA_SYNC(desc->map, desc_len, BUS_DMASYNC_PREREAD);
/* Set up the DMA descriptor. */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
desc->address1 = ring->segs[0].ds_addr;
#elif (defined(__NetBSD__) || defined(__OpenBSD__))
desc->address1 = desc->map->dm_segs[0].ds_addr;
@@ -3180,9 +3180,9 @@
/* Prevent wild fetches if mapping fails (nsegs==0). */
desc->length1 = desc->length2 = 0;
desc->address1 = desc->address2 = 0;
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#if (defined(__MidnightBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
{
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
bus_dma_segment_t *segs = ring->segs;
int nsegs = ring->nsegs;
# elif (defined(__NetBSD__) || defined(__OpenBSD__))
@@ -3960,7 +3960,7 @@
#if BSD
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
/* Service the card from the kernel idle loop without interrupts. */
static int
@@ -3988,7 +3988,7 @@
return 0;
}
-# endif /* (__FreeBSD__ && DEVICE_POLLING) */
+# endif /* (__MidnightBSD__ && DEVICE_POLLING) */
/* BSD kernels call this procedure when an interrupt happens. */
static intr_return_t
@@ -4000,7 +4000,7 @@
if ((READ_CSR(TLP_STATUS) & TLP_INT_TXRX) == 0)
return IRQ_NONE;
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
if (sc->ifp->if_capenable & IFCAP_POLLING)
return IRQ_NONE;
@@ -4012,7 +4012,7 @@
}
else
sc->quota = sc->rxring.num_descs; /* input flow control */
-# endif /* (__FreeBSD__ && DEVICE_POLLING) */
+# endif /* (__MidnightBSD__ && DEVICE_POLLING) */
/* Disable card interrupts. */
WRITE_CSR(TLP_INT_ENBL, TLP_INT_DISABLE);
@@ -4080,7 +4080,7 @@
static void
sppp_tls(struct sppp *sppp)
{
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
if (!(sppp->pp_mode & IFF_LINK2) &&
!(sppp->pp_flags & PP_FR))
# elif defined(__NetBSD__) || defined(__OpenBSD__)
@@ -4093,7 +4093,7 @@
static void
sppp_tlf(struct sppp *sppp)
{
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
if (!(sppp->pp_mode & IFF_LINK2) &&
!(sppp->pp_flags & PP_FR))
# elif defined(__NetBSD__) || defined(__OpenBSD__)
@@ -4194,7 +4194,7 @@
LMC_BPF_DETACH;
# if (defined(__NetBSD__) || defined(__OpenBSD__))
sc->sppp->pp_flags &= ~PP_CISCO;
-# elif defined(__FreeBSD__)
+# elif defined(__MidnightBSD__)
sc->ifp->if_flags &= ~IFF_LINK2;
sc->sppp->pp_flags &= ~PP_FR;
# endif
@@ -4213,7 +4213,7 @@
LMC_BPF_DETACH;
# if (defined(__NetBSD__) || defined(__OpenBSD__))
sc->sppp->pp_flags |= PP_CISCO;
-# elif defined(__FreeBSD__)
+# elif defined(__MidnightBSD__)
sc->ifp->if_flags |= IFF_LINK2;
sc->sppp->pp_flags &= ~PP_FR;
# endif
@@ -4228,7 +4228,7 @@
LMC_BPF_DETACH;
# if (defined(__NetBSD__) || defined(__OpenBSD__))
sc->sppp->pp_flags &= ~PP_CISCO;
-# elif defined(__FreeBSD__)
+# elif defined(__MidnightBSD__)
sc->ifp->if_flags &= ~IFF_LINK2;
sc->sppp->pp_flags |= PP_FR;
# endif
@@ -4478,7 +4478,7 @@
switch (cmd)
{
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING)) /* XXX necessary? */
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING)) /* XXX necessary? */
case SIOCSIFCAP:
# endif
case SIOCAIFADDR:
@@ -4702,7 +4702,7 @@
/* Notice change in line protocol. */
sc->status.line_pkg = PKG_SPPP;
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
if (sc->sppp->pp_flags & PP_FR)
sc->status.line_prot = PROT_FRM_RLY;
else if (sc->ifp->if_flags & IFF_LINK2)
@@ -4828,7 +4828,7 @@
ifp->if_mtu = MAX_DESC_LEN; /* sppp & p2p change this */
ifp->if_type = IFT_PTPSERIAL; /* p2p changes this */
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
ifp->if_capabilities |= IFCAP_POLLING;
ifp->if_capenable |= IFCAP_POLLING_NOCOUNT;
# if (__FreeBSD_version < 500000)
@@ -4837,7 +4837,7 @@
# endif
/* Every OS does it differently! */
-# if (defined(__FreeBSD__) && (__FreeBSD_version < 502000))
+# if (defined(__MidnightBSD__) && (__FreeBSD_version < 502000))
(const char *)ifp->if_name = device_get_name(sc->dev);
ifp->if_unit = device_get_unit(sc->dev);
# elif (__FreeBSD_version >= 502000)
@@ -4930,7 +4930,7 @@
ifmedia_delete_instance(&sc->ifm, IFM_INST_ANY);
# endif
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
if (sc->ifp->if_capenable & IFCAP_POLLING)
ether_poll_deregister(sc->ifp);
# endif
@@ -4946,9 +4946,9 @@
/* Detach from the ifnet kernel interface. */
if_detach(sc->ifp);
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 800082)
+# if (defined(__MidnightBSD__) && __FreeBSD_version >= 800082)
if_free(sc->ifp);
-# elif (defined(__FreeBSD__) && __FreeBSD_version >= 600000)
+# elif (defined(__MidnightBSD__) && __FreeBSD_version >= 600000)
if_free_type(sc->ifp, NSPPP ? IFT_PPP : IFT_OTHER);
# endif
}
@@ -5228,7 +5228,7 @@
.findhook = NULL,
.connect = ng_connect,
.rcvdata = ng_rcvdata,
-# if (defined(__FreeBSD__) && (__FreeBSD_version < 500000))
+# if (defined(__MidnightBSD__) && (__FreeBSD_version < 500000))
.rcvdataq = ng_rcvdata,
# endif
.disconnect = ng_disconnect,
@@ -5585,7 +5585,7 @@
/* This is the I/O configuration interface for FreeBSD */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
static int
fbsd_probe(device_t dev)
@@ -5765,7 +5765,7 @@
MODULE_DEPEND(lmc, sppp, 1, 1, 1);
# endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
/* This is the I/O configuration interface for NetBSD. */
Modified: trunk/sys/dev/lmc/if_lmc.h
===================================================================
--- trunk/sys/dev/lmc/if_lmc.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/lmc/if_lmc.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -985,7 +985,7 @@
#endif
u_int32_t address1; /* buffer1 bus address */
u_int32_t address2; /* buffer2 bus address */
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#if (defined(__MidnightBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
bus_dmamap_t map; /* bus dmamap for this descriptor */
# define TLP_BUS_DSL_VAL (sizeof(bus_dmamap_t) & TLP_BUS_DSL)
#else
@@ -1036,7 +1036,7 @@
#elif BSD
struct mbuf *head; /* tail-queue of mbufs */
struct mbuf *tail;
-# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+# if (defined(__MidnightBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
bus_dma_tag_t tag; /* bus_dma tag for desc array */
bus_dmamap_t map; /* bus_dma map for desc array */
bus_dma_segment_t segs[2]; /* bus_dmamap_load() or bus_dmamem_alloc() */
@@ -1069,7 +1069,7 @@
*/
#define IOREF_CSR 1 /* access Tulip CSRs with IO cycles if 1 */
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+#if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
# define DEV_POLL 1
#else
# define DEV_POLL 0
@@ -1152,7 +1152,7 @@
# endif
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
struct callout callout; /* watchdog needs this */
struct device *dev; /* base device pointer */
bus_space_tag_t csr_tag; /* bus_space needs this */
@@ -1174,7 +1174,7 @@
int top_spl; /* lock card->watchdog vs core_ioctl */
int bottom_spl; /* lock for buf queues & descriptor rings */
# endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#ifdef __linux__
struct pci_dev *pci_dev; /* READ/WRITE_PCI_CFG macros need this */
@@ -1211,7 +1211,7 @@
/* Hide the minor differences between OS versions */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
typedef void intr_return_t;
# define READ_PCI_CFG(sc, addr) pci_read_config ((sc)->dev, addr, 4)
# define WRITE_PCI_CFG(sc, addr, data) pci_write_config((sc)->dev, addr, data, 4)
@@ -1265,7 +1265,7 @@
# if (__FreeBSD_version >= 600000)
# define IFF_RUNNING IFF_DRV_RUNNING
# endif
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#ifdef __NetBSD__
typedef int intr_return_t;
@@ -1429,7 +1429,7 @@
#endif
#if (defined(__bsdi__) || /* unconditionally */ \
- (defined(__FreeBSD__) && (__FreeBSD_version < 503000)) || \
+ (defined(__MidnightBSD__) && (__FreeBSD_version < 503000)) || \
(defined(__NetBSD__) && (__NetBSD_Version__ < 106000000)) || \
(defined(__OpenBSD__) && ( OpenBSD < 200111)))
# define IFQ_ENQUEUE(ifq, m, pa, err) \
@@ -1532,7 +1532,7 @@
static int t1_ioctl(softc_t *, struct ioctl *);
#if IFNET
-# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\
+# if ((defined(__MidnightBSD__) && (__FreeBSD_version < 500000)) ||\
defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__))
static void netisr_dispatch(int, struct mbuf *);
# endif
@@ -1542,7 +1542,7 @@
#if BSD
static void mbuf_enqueue(struct desc_ring *, struct mbuf *);
static struct mbuf* mbuf_dequeue(struct desc_ring *);
-# ifdef __FreeBSD__
+# ifdef __MidnightBSD__
static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int);
# endif
static int create_ring(softc_t *, struct desc_ring *, int);
@@ -1571,7 +1571,7 @@
static void core_interrupt(void *, int);
static void user_interrupt(softc_t *, int);
#if BSD
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
+# if (defined(__MidnightBSD__) && defined(DEVICE_POLLING))
static int fbsd_poll(struct ifnet *, enum poll_cmd, int);
# endif
static intr_return_t bsd_interrupt(void *);
@@ -1639,12 +1639,12 @@
static int attach_card(softc_t *, const char *);
static void detach_card(softc_t *);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
static int fbsd_probe(device_t);
static int fbsd_detach(device_t);
static int fbsd_shutdown(device_t);
static int fbsd_attach(device_t);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#ifdef __NetBSD__
static int nbsd_match(struct device *t, struct cfdata *, void *);
Modified: trunk/sys/dev/malo/if_malo.c
===================================================================
--- trunk/sys/dev/malo/if_malo.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/malo/if_malo.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/dev/malo/if_malo.c 278808 2015-02-15 20:02:29Z marius $");
#endif
Modified: trunk/sys/dev/malo/if_malo_pci.c
===================================================================
--- trunk/sys/dev/malo/if_malo_pci.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/malo/if_malo_pci.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/dev/malo/if_malo_pci.c 278418 2015-02-08 22:29:57Z marius $");
#endif
Modified: trunk/sys/dev/malo/if_malohal.c
===================================================================
--- trunk/sys/dev/malo/if_malohal.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/malo/if_malohal.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/dev/malo/if_malohal.c 190550 2009-03-30 11:23:14Z weongyo $");
#endif
Modified: trunk/sys/dev/mpr/mpi/mpi2_type.h
===================================================================
--- trunk/sys/dev/mpr/mpi/mpi2_type.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/mpr/mpi/mpi2_type.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -82,7 +82,7 @@
typedef signed short S16;
typedef unsigned short U16;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
typedef int32_t S32;
typedef uint32_t U32;
Modified: trunk/sys/dev/mps/mpi/mpi2_type.h
===================================================================
--- trunk/sys/dev/mps/mpi/mpi2_type.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/mps/mpi/mpi2_type.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -77,7 +77,7 @@
typedef signed short S16;
typedef unsigned short U16;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
typedef int32_t S32;
typedef uint32_t U32;
Modified: trunk/sys/dev/mpt/mpilib/mpi_type.h
===================================================================
--- trunk/sys/dev/mpt/mpilib/mpi_type.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/mpt/mpilib/mpi_type.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -78,7 +78,7 @@
typedef signed short S16;
typedef unsigned short U16;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
typedef int32_t S32;
typedef uint32_t U32;
Modified: trunk/sys/dev/mwl/if_mwl_pci.c
===================================================================
--- trunk/sys/dev/mwl/if_mwl_pci.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/mwl/if_mwl_pci.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/dev/mwl/if_mwl_pci.c 278415 2015-02-08 22:27:17Z marius $");
#endif
Modified: trunk/sys/dev/netmap/netmap.c
===================================================================
--- trunk/sys/dev/netmap/netmap.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -348,7 +348,7 @@
* is present in netmap_kern.h
*/
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/cdefs.h> /* prerequisite */
#include <sys/types.h>
#include <sys/errno.h>
@@ -811,7 +811,7 @@
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
static void
netmap_knlist_destroy(NM_SELINFO_T *si)
{
@@ -821,7 +821,7 @@
/* now we don't need the mutex anymore */
mtx_destroy(&si->m);
}
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
/* undo the actions performed by netmap_krings_create */
@@ -1055,7 +1055,7 @@
{
struct netmap_adapter *na = priv->np_na;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* np_refcount is the number of active mmaps on
* this file descriptor
@@ -1063,7 +1063,7 @@
if (--priv->np_refcount > 0) {
return 0;
}
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
if (!na) {
return 1; //XXX is it correct?
}
@@ -2225,7 +2225,7 @@
case NIOCCONFIG:
error = netmap_bdg_config(nmr);
break;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
case FIONBIO:
case FIOASYNC:
ND("FIONBIO/FIOASYNC are no-ops");
@@ -2585,9 +2585,9 @@
/* the following is only needed for na that use the host port.
* XXX do we have something similar for linux ?
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
na->if_input = ifp->if_input; /* for netmap_send_up */
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
NETMAP_SET_CAPABLE(ifp);
}
@@ -2711,7 +2711,7 @@
}
#endif /* linux */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if_printf(ifp, "netmap queues/slots: TX %d/%d, RX %d/%d\n",
hwna->up.num_tx_rings, hwna->up.num_tx_desc,
hwna->up.num_rx_rings, hwna->up.num_rx_desc);
@@ -3089,7 +3089,7 @@
goto fail;
netmap_init_bridges();
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
nm_vi_init_index();
#endif
printf("netmap: loaded module\n");
Modified: trunk/sys/dev/netmap/netmap_generic.c
===================================================================
--- trunk/sys/dev/netmap/netmap_generic.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_generic.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -61,7 +61,7 @@
*
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h> /* prerequisite */
__FBSDID("$FreeBSD: stable/10/sys/dev/netmap/netmap_generic.c 297478 2016-04-01 01:39:44Z np $");
@@ -413,11 +413,11 @@
generic_mbuf_destructor(struct mbuf *m)
{
netmap_generic_irq(MBUF_IFP(m), MBUF_TXQ(m), NULL);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (netmap_verbose)
RD(5, "Tx irq (%p) queue %d index %d" , m, MBUF_TXQ(m), (int)(uintptr_t)m->m_ext.ext_arg1);
netmap_default_mbuf_destructor(m);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
IFRATE(rate_ctx.new.txirq++);
}
Modified: trunk/sys/dev/netmap/netmap_kern.h
===================================================================
--- trunk/sys/dev/netmap/netmap_kern.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_kern.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -40,7 +40,7 @@
#define WITH_MONITOR
#define WITH_GENERIC
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#define likely(x) __builtin_expect((long)!!(x), 1L)
#define unlikely(x) __builtin_expect((long)!!(x), 0L)
@@ -918,7 +918,7 @@
#ifdef IFCAP_NETMAP /* or FreeBSD ? */
ifp->if_capenable |= IFCAP_NETMAP;
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
na->if_transmit = ifp->if_transmit;
ifp->if_transmit = netmap_transmit;
#else
@@ -935,7 +935,7 @@
{
struct ifnet *ifp = na->ifp;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
ifp->if_transmit = na->if_transmit;
#else
ifp->netdev_ops = (void *)na->if_transmit;
@@ -1218,7 +1218,7 @@
* Macros to determine if an interface is netmap capable or netmap enabled.
* See the magic field in struct netmap_adapter.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* on FreeBSD just use if_capabilities and if_capenable.
*/
@@ -1245,7 +1245,7 @@
#endif /* linux */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/* Assigns the device IOMMU domain to an allocator.
* Returns -ENOMEM in case the domain is different */
Modified: trunk/sys/dev/netmap/netmap_mbq.c
===================================================================
--- trunk/sys/dev/netmap/netmap_mbq.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_mbq.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -31,13 +31,13 @@
#ifdef linux
#include "bsd_glue.h"
-#else /* __FreeBSD__ */
+#else /* __MidnightBSD__ */
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#include "netmap_mbq.h"
Modified: trunk/sys/dev/netmap/netmap_mem2.c
===================================================================
--- trunk/sys/dev/netmap/netmap_mem2.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_mem2.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -32,7 +32,7 @@
#include "osx_glue.h"
#endif /* __APPLE__ */
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/cdefs.h> /* prerequisite */
__FBSDID("$FreeBSD: stable/10/sys/dev/netmap/netmap_mem2.c 283343 2015-05-24 01:48:33Z pkelsey $");
@@ -49,7 +49,7 @@
#include <net/vnet.h>
#include <machine/bus.h> /* bus_dmamap_* */
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#include <net/netmap.h>
#include <dev/netmap/netmap_kern.h>
@@ -1012,7 +1012,7 @@
if (na->pdev == NULL)
return 0;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
(void)i;
(void)lim;
D("unsupported on FreeBSD");
@@ -1028,7 +1028,7 @@
static int
netmap_mem_map(struct netmap_obj_pool *p, struct netmap_adapter *na)
{
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
D("unsupported on FreeBSD");
#else /* linux */
int i, lim = p->_objtotal;
Modified: trunk/sys/dev/netmap/netmap_monitor.c
===================================================================
--- trunk/sys/dev/netmap/netmap_monitor.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_monitor.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -59,7 +59,7 @@
*/
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/cdefs.h> /* prerequisite */
#include <sys/types.h>
Modified: trunk/sys/dev/netmap/netmap_offloadings.c
===================================================================
--- trunk/sys/dev/netmap/netmap_offloadings.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_offloadings.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -26,7 +26,7 @@
/* $FreeBSD: stable/10/sys/dev/netmap/netmap_offloadings.c 270252 2014-08-20 23:34:36Z luigi $ */
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/cdefs.h> /* prerequisite */
#include <sys/types.h>
Modified: trunk/sys/dev/netmap/netmap_pipe.c
===================================================================
--- trunk/sys/dev/netmap/netmap_pipe.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_pipe.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -26,7 +26,7 @@
/* $FreeBSD: stable/10/sys/dev/netmap/netmap_pipe.c 278779 2015-02-14 19:41:26Z luigi $ */
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/cdefs.h> /* prerequisite */
#include <sys/types.h>
Modified: trunk/sys/dev/netmap/netmap_vale.c
===================================================================
--- trunk/sys/dev/netmap/netmap_vale.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/netmap/netmap_vale.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -56,7 +56,7 @@
* is present in netmap_kern.h
*/
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/cdefs.h> /* prerequisite */
__FBSDID("$FreeBSD: stable/10/sys/dev/netmap/netmap_vale.c 270252 2014-08-20 23:34:36Z luigi $");
Modified: trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h
===================================================================
--- trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -124,7 +124,7 @@
/* the maximum number of interrupt coalesce context */
#define TD_MAX_INT_COALESCE 512
-#if (defined(__FreeBSD__))
+#if (defined(__MidnightBSD__))
#define MAX_OUTSTANDING_IO_PER_LUN 64
#else
#define MAX_OUTSTANDING_IO_PER_LUN 254 //64
Modified: trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.c
===================================================================
--- trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -3390,7 +3390,7 @@
{
bit32 status;
tmf_pass_through_req_t *tmf_req = (tmf_pass_through_req_t*)agIOCTLPayload->FunctionSpecificArea;
-#if !(defined(__FreeBSD__))
+#if !(defined(__MidnightBSD__))
status = ostiSendResetDeviceIoctl(tiRoot, agParam2, tmf_req->pathId, tmf_req->targetId, tmf_req->lun, resetType);
#endif
TI_DBG3(("Status returned from ostiSendResetDeviceIoctl is %d\n",status));
Modified: trunk/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c
===================================================================
--- trunk/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1090,7 +1090,7 @@
}
if(status == IOCTL_CALL_FAIL)
{
-#if !(defined(__FreeBSD__))
+#if !(defined(__MidnightBSD__))
printk("Error getting Adapter WWN\n");
#else
printf("Error getting Adapter WWN\n");
Modified: trunk/sys/dev/tpm/tpm.c
===================================================================
--- trunk/sys/dev/tpm/tpm.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/tpm/tpm.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -28,7 +28,7 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/uio.h>
@@ -55,7 +55,7 @@
#endif
#include <dev/tpm/tpmvar.h>
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* XXX horrible hack for tcsd (-lpthread) workaround on OpenBSD */
#undef PCATCH
#define PCATCH 0
@@ -67,7 +67,7 @@
#define TPM_PARAM_SIZE 0x0001
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define IRQUNK -1
#endif
@@ -148,7 +148,7 @@
int tpm_enabled;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define TPMSOFTC(dev) \
((struct tpm_softc *)dev->si_drv1)
@@ -208,7 +208,7 @@
int tpm_tis12_write(struct tpm_softc *, void *, int);
int tpm_tis12_end(struct tpm_softc *, int, int);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
void tpm_intr(void *);
#else
int tpm_intr(void *);
@@ -232,7 +232,7 @@
int tpm_legacy_write(struct tpm_softc *, void *, int);
int tpm_legacy_end(struct tpm_softc *, int, int);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* FreeBSD specific code for probing and attaching TPM to device tree.
@@ -423,7 +423,7 @@
return;
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
sc->sc_suspend = 0;
#else
sc->sc_suspend = PWR_RESUME;
@@ -642,13 +642,13 @@
/* Save TPM state on suspend. */
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpm_suspend(device_t dev)
#else
tpm_suspend(struct tpm_softc *sc, int why)
#endif
{
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
struct tpm_softc *sc = device_get_softc(dev);
int why = 1;
#endif
@@ -676,13 +676,13 @@
* to restore the previously saved state.
*/
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpm_resume(device_t dev)
#else
tpm_resume(struct tpm_softc *sc, int why)
#endif
{
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
struct tpm_softc *sc = device_get_softc(dev);
int why = 0;
#endif
@@ -695,7 +695,7 @@
}
/* Dispatch suspend and resume events. */
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
void
tpm_powerhook(int why, void *self)
{
@@ -706,7 +706,7 @@
else
tpm_resume(sc, why);
}
-#endif /* !__FreeBSD__ */
+#endif /* !__MidnightBSD__ */
/* Wait for given status bits using polling. */
int
@@ -1082,7 +1082,7 @@
return rv;
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
void
#else
int
@@ -1105,7 +1105,7 @@
#endif
if (!(r & (TPM_CMD_READY_INT | TPM_LOCALITY_CHANGE_INT |
TPM_STS_VALID_INT | TPM_DATA_AVAIL_INT)))
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
return;
#else
return 0;
@@ -1124,7 +1124,7 @@
bus_space_write_4(sc->sc_bt, sc->sc_bh, TPM_INT_STATUS, r);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
return;
#else
return 1;
@@ -1239,7 +1239,7 @@
return rv;
}
-#if defined(TPM_DEBUG) && !defined(__FreeBSD__)
+#if defined(TPM_DEBUG) && !defined(__MidnightBSD__)
printf("%s: bits %b\n", sc->sc_dev.dv_xname, r, TPM_LEGACY_BITS);
#endif
if ((r & (TPM_LEGACY_BUSY|bits)) != bits)
@@ -1313,7 +1313,7 @@
return rv;
}
-#if defined(TPM_DEBUG) && !defined(__FreeBSD__)
+#if defined(TPM_DEBUG) && !defined(__MidnightBSD__)
printf("%s: bits %b\n", sc->sc_dev.dv_xname, r, TPM_LEGACY_BITS);
#endif
if (r & TPM_LEGACY_BUSY)
@@ -1327,7 +1327,7 @@
}
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpmopen(struct cdev *dev, int flag, int mode, struct thread *td)
#else
tpmopen(dev_t dev, int flag, int mode, struct proc *p)
@@ -1347,7 +1347,7 @@
}
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpmclose(struct cdev *dev, int flag, int mode, struct thread *td)
#else
tpmclose(dev_t dev, int flag, int mode, struct proc *p)
@@ -1367,7 +1367,7 @@
}
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpmread(struct cdev *dev, struct uio *uio, int flags)
#else
tpmread(dev_t dev, struct uio *uio, int flags)
@@ -1443,7 +1443,7 @@
}
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpmwrite(struct cdev *dev, struct uio *uio, int flags)
#else
tpmwrite(dev_t dev, struct uio *uio, int flags)
@@ -1484,7 +1484,7 @@
}
int
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
tpmioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags,
struct thread *td)
#else
Modified: trunk/sys/dev/tpm/tpm_isa.c
===================================================================
--- trunk/sys/dev/tpm/tpm_isa.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/tpm/tpm_isa.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -26,7 +26,7 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/uio.h>
Modified: trunk/sys/dev/tpm/tpmvar.h
===================================================================
--- trunk/sys/dev/tpm/tpmvar.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/tpm/tpmvar.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -23,7 +23,7 @@
#define _TPMVAR_H
struct tpm_softc {
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
struct device sc_dev;
#endif
void *sc_ih;
@@ -46,7 +46,7 @@
#define TPM_OPEN 0x0001
int sc_vector;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
void *intr_cookie;
int mem_rid, irq_rid;
struct resource *mem_res, *irq_res;
@@ -53,7 +53,7 @@
struct cdev *sc_cdev;
#endif
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
void *sc_powerhook;
#endif
int sc_suspend;
Modified: trunk/sys/dev/twe/twe_compat.h
===================================================================
--- trunk/sys/dev/twe/twe_compat.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/twe/twe_compat.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -33,7 +33,7 @@
* Portability and compatibility interfaces.
*/
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/******************************************************************************
* FreeBSD
*/
Modified: trunk/sys/dev/wi/if_wireg.h
===================================================================
--- trunk/sys/dev/wi/if_wireg.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/dev/wi/if_wireg.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -85,7 +85,7 @@
#ifdef __NetBSD__
#define OS_STRING_NAME "NetBSD"
#endif
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
#define OS_STRING_NAME "FreeBSD"
#endif
#ifdef __OpenBSD__
Modified: trunk/sys/fs/nfs/nfs_var.h
===================================================================
--- trunk/sys/fs/nfs/nfs_var.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/fs/nfs/nfs_var.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -81,7 +81,7 @@
struct nfsvattr;
struct nfs_vattr;
struct NFSSVCARGS;
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
NFS_ACCESS_ARGS;
NFS_OPEN_ARGS;
NFS_GETATTR_ARGS;
Modified: trunk/sys/fs/nfsclient/nfs_clstate.c
===================================================================
--- trunk/sys/fs/nfsclient/nfs_clstate.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/fs/nfsclient/nfs_clstate.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -2900,7 +2900,7 @@
lp->nfsl_stateid.other[2]);
LIST_FOREACH(lop, &lp->nfsl_lock, nfslo_list) {
if (locks)
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
printf("lck typ=%d fst=%ju end=%ju\n",
lop->nfslo_type, (intmax_t)lop->nfslo_first,
(intmax_t)lop->nfslo_end);
@@ -2936,7 +2936,7 @@
lp->nfsl_stateid.other[2]);
LIST_FOREACH(lop, &lp->nfsl_lock, nfslo_list) {
if (locks)
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
printf("lck typ=%d fst=%ju end=%ju\n",
lop->nfslo_type, (intmax_t)lop->nfslo_first,
(intmax_t)lop->nfslo_end);
Modified: trunk/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
===================================================================
--- trunk/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h,v 1.2 2008/12/03 00:25:55 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
*
@@ -472,7 +472,7 @@
XFS_AT_TYPE|XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|\
XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_GENCOUNT)
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/*
* Modes.
*/
@@ -482,7 +482,7 @@
#define VREAD S_IRUSR /* read, write, execute permissions */
#define VWRITE S_IWUSR
#define VEXEC S_IXUSR
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#define MODEMASK ALLPERMS /* mode bits plus permission bits */
Modified: trunk/sys/gnu/fs/xfs/xfs_types.h
===================================================================
--- trunk/sys/gnu/fs/xfs/xfs_types.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/gnu/fs/xfs/xfs_types.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -32,7 +32,7 @@
/*
* Additional type declarations for XFS
*/
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
typedef signed char __int8_t;
typedef unsigned char __uint8_t;
typedef signed short int __int16_t;
Modified: trunk/sys/net/bpf.h
===================================================================
--- trunk/sys/net/bpf.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net/bpf.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1132,7 +1132,7 @@
* them collide with something used elsewhere. On platforms that
* don't already define it, define it as 245.
*/
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
+#if !defined(__MidnightBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
#define DLT_PFSYNC 246
#endif
Modified: trunk/sys/net/if_atm.h
===================================================================
--- trunk/sys/net/if_atm.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net/if_atm.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -203,7 +203,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
#define RTALLOC1(A,B) rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
+#elif defined(__MidnightBSD__)
#define RTALLOC1(A,B) rtalloc1((A),(B),0UL)
#endif
Modified: trunk/sys/net/if_spppfr.c
===================================================================
--- trunk/sys/net/if_spppfr.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net/if_spppfr.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -26,7 +26,7 @@
#include <sys/param.h>
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_ipx.h"
@@ -46,7 +46,7 @@
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/syslog.h>
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <sys/random.h>
#endif
#include <sys/malloc.h>
@@ -79,7 +79,7 @@
#include <netinet/tcp.h>
#endif
-#if defined (__FreeBSD__) || defined (__OpenBSD__)
+#if defined (__MidnightBSD__) || defined (__OpenBSD__)
# include <netinet/if_ether.h>
#else
# include <net/ethertypes.h>
@@ -150,7 +150,7 @@
unsigned short ptarget2;
} __packed;
-#if defined(__FreeBSD__) && __FreeBSD_version < 501113
+#if defined(__MidnightBSD__) && __FreeBSD_version < 501113
#define SPP_FMT "%s%d: "
#define SPP_ARGS(ifp) (ifp)->if_name, (ifp)->if_unit
#else
Modified: trunk/sys/net/zlib.c
===================================================================
--- trunk/sys/net/zlib.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net/zlib.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
#define NO_ZCFUNCS
#define MY_ZCALLOC
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
#define _tr_init _zlib104_tr_init
#define _tr_align _zlib104_tr_align
#define _tr_tally _zlib104_tr_tally
Modified: trunk/sys/net/zlib.h
===================================================================
--- trunk/sys/net/zlib.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net/zlib.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -511,7 +511,7 @@
done by inflate().
*/
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
#define inflate _zlib104_inflate /* FreeBSD already has an inflate :-( */
#endif
Modified: trunk/sys/net80211/ieee80211_action.c
===================================================================
--- trunk/sys/net80211/ieee80211_action.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_action.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_action.c 254315 2013-08-14 04:24:25Z rpaulo $");
#endif
Modified: trunk/sys/net80211/ieee80211_adhoc.c
===================================================================
--- trunk/sys/net80211/ieee80211_adhoc.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_adhoc.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_adhoc.c 262007 2014-02-17 01:36:53Z kevlo $");
#endif
Modified: trunk/sys/net80211/ieee80211_alq.c
===================================================================
--- trunk/sys/net80211/ieee80211_alq.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_alq.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_alq.c 233255 2012-03-21 03:19:50Z adrian $");
#endif
Modified: trunk/sys/net80211/ieee80211_dfs.c
===================================================================
--- trunk/sys/net80211/ieee80211_dfs.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_dfs.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_dfs.c 230793 2012-01-31 00:03:49Z adrian $");
#endif
Modified: trunk/sys/net80211/ieee80211_hostap.c
===================================================================
--- trunk/sys/net80211/ieee80211_hostap.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_hostap.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_hostap.c 262007 2014-02-17 01:36:53Z kevlo $");
#endif
Modified: trunk/sys/net80211/ieee80211_ht.c
===================================================================
--- trunk/sys/net80211/ieee80211_ht.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_ht.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_ht.c 314667 2017-03-04 13:03:31Z avg $");
#endif
Modified: trunk/sys/net80211/ieee80211_hwmp.c
===================================================================
--- trunk/sys/net80211/ieee80211_hwmp.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_hwmp.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_hwmp.c 314667 2017-03-04 13:03:31Z avg $");
#endif
Modified: trunk/sys/net80211/ieee80211_ioctl.h
===================================================================
--- trunk/sys/net80211/ieee80211_ioctl.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_ioctl.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -576,7 +576,7 @@
uint16_t sv_vlan;
};
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
/*
* FreeBSD-style ioctls.
*/
@@ -857,6 +857,6 @@
#define IEEE80211_CLONE_WDSLEGACY 0x0004 /* legacy WDS processing */
#define IEEE80211_CLONE_MACADDR 0x0008 /* use specified mac addr */
#define IEEE80211_CLONE_TDMA 0x0010 /* operate in TDMA mode */
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
#endif /* _NET80211_IEEE80211_IOCTL_H_ */
Modified: trunk/sys/net80211/ieee80211_mesh.c
===================================================================
--- trunk/sys/net80211/ieee80211_mesh.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_mesh.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_mesh.c 322061 2017-08-04 20:24:23Z pfg $");
#endif
Modified: trunk/sys/net80211/ieee80211_monitor.c
===================================================================
--- trunk/sys/net80211/ieee80211_monitor.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_monitor.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_monitor.c 193287 2009-06-02 00:04:10Z sam $");
#endif
Modified: trunk/sys/net80211/ieee80211_sta.c
===================================================================
--- trunk/sys/net80211/ieee80211_sta.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_sta.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_sta.c 262007 2014-02-17 01:36:53Z kevlo $");
#endif
Modified: trunk/sys/net80211/ieee80211_tdma.c
===================================================================
--- trunk/sys/net80211/ieee80211_tdma.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_tdma.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_tdma.c 254506 2013-08-18 23:40:30Z adrian $");
#endif
Modified: trunk/sys/net80211/ieee80211_var.h
===================================================================
--- trunk/sys/net80211/ieee80211_var.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_var.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -35,7 +35,7 @@
/* NB: portability glue must go first */
#if defined(__NetBSD__)
#include <net80211/ieee80211_netbsd.h>
-#elif defined(__FreeBSD__)
+#elif defined(__MidnightBSD__)
#include <net80211/ieee80211_freebsd.h>
#elif defined(__linux__)
#include <net80211/ieee80211_linux.h>
Modified: trunk/sys/net80211/ieee80211_wds.c
===================================================================
--- trunk/sys/net80211/ieee80211_wds.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/net80211/ieee80211_wds.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
__FBSDID("$FreeBSD: stable/10/sys/net80211/ieee80211_wds.c 283855 2015-05-31 23:29:04Z ae $");
#endif
Modified: trunk/sys/netinet/ipfw/dn_sched_qfq.c
===================================================================
--- trunk/sys/netinet/ipfw/dn_sched_qfq.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/ipfw/dn_sched_qfq.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -71,7 +71,7 @@
}
#endif
-#if !defined(_KERNEL) || defined( __FreeBSD__ ) || defined(_WIN32) || (defined(__MIPSEL__) && defined(LINUX_24))
+#if !defined(_KERNEL) || defined( __MidnightBSD__ ) || defined(_WIN32) || (defined(__MIPSEL__) && defined(LINUX_24))
static inline unsigned long __fls(unsigned long word)
{
return fls(word) - 1;
Modified: trunk/sys/netinet/ipfw/ip_fw2.c
===================================================================
--- trunk/sys/netinet/ipfw/ip_fw2.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/ipfw/ip_fw2.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -364,7 +364,7 @@
return(1);
}
} else {
-#ifdef __FreeBSD__ /* and OSX too ? */
+#ifdef __MidnightBSD__ /* and OSX too ? */
struct ifaddr *ia;
if_addr_rlock(ifp);
@@ -378,7 +378,7 @@
}
}
if_addr_runlock(ifp);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
return(0); /* no match, fail ... */
}
@@ -407,7 +407,7 @@
static int
verify_path(struct in_addr src, struct ifnet *ifp, u_int fib)
{
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
return 0;
#else
struct route ro;
@@ -452,7 +452,7 @@
/* found valid route */
RTFREE(ro.ro_rt);
return 1;
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
#ifdef INET6
@@ -660,7 +660,7 @@
check_uidgid(ipfw_insn_u32 *insn, struct ip_fw_args *args, int *ugid_lookupp,
struct ucred **uc)
{
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* XXX */
return cred_check(insn, proto, oif,
dst_ip, dst_port, src_ip, src_port,
@@ -761,7 +761,7 @@
else if (insn->o.opcode == O_JAIL)
match = ((*uc)->cr_prison->pr_id == (int)insn->d[0]);
return (match);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
/*
@@ -854,7 +854,7 @@
* these types of constraints, as well as decrease contention
* on pcb related locks.
*/
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
struct bsd_ucred ucred_cache;
#else
struct ucred *ucred_cache = NULL;
@@ -1311,7 +1311,7 @@
match = check_uidgid(
(ipfw_insn_u32 *)cmd,
args, &ucred_lookup,
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
&ucred_cache);
#else
(void *)&ucred_cache);
@@ -1432,19 +1432,19 @@
check_uidgid(
(ipfw_insn_u32 *)cmd,
args, &ucred_lookup,
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
&ucred_cache);
if (v == 4 /* O_UID */)
key = ucred_cache->cr_uid;
else if (v == 5 /* O_JAIL */)
key = ucred_cache->cr_prison->pr_id;
-#else /* !__FreeBSD__ */
+#else /* !__MidnightBSD__ */
(void *)&ucred_cache);
if (v ==4 /* O_UID */)
key = ucred_cache.uid;
else if (v == 5 /* O_JAIL */)
key = ucred_cache.xid;
-#endif /* !__FreeBSD__ */
+#endif /* !__MidnightBSD__ */
key = htonl(key);
} else
break;
@@ -2477,7 +2477,7 @@
printf("ipfw: ouch!, skip past end of rules, denying packet\n");
}
IPFW_RUNLOCK(chain);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (ucred_cache != NULL)
crfree(ucred_cache);
#endif
Modified: trunk/sys/netinet/ipfw/ip_fw_dynamic.c
===================================================================
--- trunk/sys/netinet/ipfw/ip_fw_dynamic.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/ipfw/ip_fw_dynamic.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -123,7 +123,7 @@
#define V_ipfw_timeout VNET(ipfw_timeout)
static uma_zone_t ipfw_dyn_rule_zone;
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
DEFINE_SPINLOCK(ipfw_dyn_mtx);
#else
static struct mtx ipfw_dyn_mtx; /* mutex guarding dynamic rules */
Modified: trunk/sys/netinet/ipfw/ip_fw_log.c
===================================================================
--- trunk/sys/netinet/ipfw/ip_fw_log.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/ipfw/ip_fw_log.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -447,7 +447,7 @@
(ipoff & IP_MF) ? "+" : "");
}
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (oif || m->m_pkthdr.rcvif)
log(LOG_SECURITY | LOG_INFO,
"ipfw: %d %s %s %s via %s%s\n",
Modified: trunk/sys/netinet/sctp_input.c
===================================================================
--- trunk/sys/netinet/sctp_input.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/sctp_input.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -6189,7 +6189,7 @@
return;
}
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
extern int *sctp_cpuarry;
#endif
@@ -6197,7 +6197,7 @@
void
sctp_input(struct mbuf *m, int off)
{
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
struct ip *ip;
struct sctphdr *sh;
int offset;
Modified: trunk/sys/netinet/sctp_pcb.c
===================================================================
--- trunk/sys/netinet/sctp_pcb.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/sctp_pcb.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -5602,7 +5602,7 @@
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
struct sctp_mcore_ctrl *sctp_mcore_workers = NULL;
int *sctp_cpuarry = NULL;
void
@@ -5776,13 +5776,13 @@
#if defined(SCTP_LOCAL_TRACE_BUF)
bzero(&SCTP_BASE_SYSCTL(sctp_log), sizeof(struct sctp_log));
#endif
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if defined(__MidnightBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
SCTP_MALLOC(SCTP_BASE_STATS, struct sctpstat *,
((mp_maxid + 1) * sizeof(struct sctpstat)),
SCTP_M_MCORE);
#endif
(void)SCTP_GETTIME_TIMEVAL(&tv);
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if defined(__MidnightBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
bzero(SCTP_BASE_STATS, (sizeof(struct sctpstat) * (mp_maxid + 1)));
SCTP_BASE_STATS[PCPU_GET(cpuid)].sctps_discontinuitytime.tv_sec = (uint32_t) tv.tv_sec;
SCTP_BASE_STATS[PCPU_GET(cpuid)].sctps_discontinuitytime.tv_usec = (uint32_t) tv.tv_usec;
@@ -5893,7 +5893,7 @@
}
sctp_startup_iterator();
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
sctp_startup_mcore_threads();
#endif
@@ -6048,7 +6048,7 @@
SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq));
SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf));
SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack));
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if defined(__MidnightBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
SCTP_FREE(SCTP_BASE_STATS, SCTP_M_MCORE);
#endif
}
Modified: trunk/sys/netinet/sctp_pcb.h
===================================================================
--- trunk/sys/netinet/sctp_pcb.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/sctp_pcb.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -245,7 +245,7 @@
* All static structures that anchor the system must be here.
*/
struct sctp_epinfo sctppcbinfo;
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if defined(__MidnightBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
struct sctpstat *sctpstat;
#else
struct sctpstat sctpstat;
@@ -645,7 +645,7 @@
struct sctp_inpcb *,
uint8_t co_off);
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
void
sctp_queue_to_mcore(struct mbuf *m, int off, int cpu_to_use);
Modified: trunk/sys/netinet/sctp_structs.h
===================================================================
--- trunk/sys/netinet/sctp_structs.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/sctp_structs.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -108,7 +108,7 @@
typedef int (*inp_func) (struct sctp_inpcb *, void *ptr, uint32_t val);
typedef void (*end_func) (void *ptr, uint32_t val);
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
+#if defined(__MidnightBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
/* whats on the mcore control struct */
struct sctp_mcore_queue {
TAILQ_ENTRY(sctp_mcore_queue) next;
Modified: trunk/sys/netinet/sctp_uio.h
===================================================================
--- trunk/sys/netinet/sctp_uio.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netinet/sctp_uio.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -1125,7 +1125,7 @@
#define SCTP_STAT_INCR(_x) SCTP_STAT_INCR_BY(_x,1)
#define SCTP_STAT_DECR(_x) SCTP_STAT_DECR_BY(_x,1)
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
+#if defined(__MidnightBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
#define SCTP_STAT_INCR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x += _d)
#define SCTP_STAT_DECR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x -= _d)
#else
Modified: trunk/sys/netpfil/ipfw/dn_sched_qfq.c
===================================================================
--- trunk/sys/netpfil/ipfw/dn_sched_qfq.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netpfil/ipfw/dn_sched_qfq.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -78,7 +78,7 @@
}
#endif
-#if !defined(_KERNEL) || defined( __FreeBSD__ ) || defined(_WIN32) || (defined(__MIPSEL__) && defined(LINUX_24))
+#if !defined(_KERNEL) || defined( __MidnightBSD__ ) || defined(_WIN32) || (defined(__MIPSEL__) && defined(LINUX_24))
static inline unsigned long __fls(unsigned long word)
{
return fls(word) - 1;
Modified: trunk/sys/netpfil/ipfw/ip_fw2.c
===================================================================
--- trunk/sys/netpfil/ipfw/ip_fw2.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netpfil/ipfw/ip_fw2.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -372,7 +372,7 @@
return(1);
}
} else {
-#ifdef __FreeBSD__ /* and OSX too ? */
+#ifdef __MidnightBSD__ /* and OSX too ? */
struct ifaddr *ia;
if_addr_rlock(ifp);
@@ -386,7 +386,7 @@
}
}
if_addr_runlock(ifp);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
return(0); /* no match, fail ... */
}
@@ -415,7 +415,7 @@
static int
verify_path(struct in_addr src, struct ifnet *ifp, u_int fib)
{
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
return 0;
#else
struct route ro;
@@ -460,7 +460,7 @@
/* found valid route */
RTFREE(ro.ro_rt);
return 1;
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
#ifdef INET6
@@ -666,7 +666,7 @@
check_uidgid(ipfw_insn_u32 *insn, struct ip_fw_args *args, int *ugid_lookupp,
struct ucred **uc)
{
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
/* XXX */
return cred_check(insn, proto, oif,
dst_ip, dst_port, src_ip, src_port,
@@ -767,7 +767,7 @@
else if (insn->o.opcode == O_JAIL)
match = ((*uc)->cr_prison->pr_id == (int)insn->d[0]);
return (match);
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
}
/*
@@ -892,7 +892,7 @@
* these types of constraints, as well as decrease contention
* on pcb related locks.
*/
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
struct bsd_ucred ucred_cache;
#else
struct ucred *ucred_cache = NULL;
@@ -1355,7 +1355,7 @@
match = check_uidgid(
(ipfw_insn_u32 *)cmd,
args, &ucred_lookup,
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
&ucred_cache);
#else
(void *)&ucred_cache);
@@ -1476,19 +1476,19 @@
check_uidgid(
(ipfw_insn_u32 *)cmd,
args, &ucred_lookup,
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
&ucred_cache);
if (v == 4 /* O_UID */)
key = ucred_cache->cr_uid;
else if (v == 5 /* O_JAIL */)
key = ucred_cache->cr_prison->pr_id;
-#else /* !__FreeBSD__ */
+#else /* !__MidnightBSD__ */
(void *)&ucred_cache);
if (v ==4 /* O_UID */)
key = ucred_cache.uid;
else if (v == 5 /* O_JAIL */)
key = ucred_cache.xid;
-#endif /* !__FreeBSD__ */
+#endif /* !__MidnightBSD__ */
key = htonl(key);
} else
break;
@@ -2533,7 +2533,7 @@
printf("ipfw: ouch!, skip past end of rules, denying packet\n");
}
IPFW_PF_RUNLOCK(chain);
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (ucred_cache != NULL)
crfree(ucred_cache);
#endif
Modified: trunk/sys/netpfil/ipfw/ip_fw_log.c
===================================================================
--- trunk/sys/netpfil/ipfw/ip_fw_log.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netpfil/ipfw/ip_fw_log.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -537,7 +537,7 @@
(ipoff & IP_MF) ? "+" : "");
}
}
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
if (oif || m->m_pkthdr.rcvif)
log(LOG_SECURITY | LOG_INFO,
"ipfw: %d %s %s %s via %s%s\n",
Modified: trunk/sys/netpfil/ipfw/test/dn_test.h
===================================================================
--- trunk/sys/netpfil/ipfw/test/dn_test.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netpfil/ipfw/test/dn_test.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -154,7 +154,7 @@
#endif
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
int fls(int);
#endif
Modified: trunk/sys/netpfil/ipfw/test/test_dn_sched.c
===================================================================
--- trunk/sys/netpfil/ipfw/test/test_dn_sched.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/netpfil/ipfw/test/test_dn_sched.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -75,7 +75,7 @@
return *v;
}
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
int
fls(int mask)
{
Modified: trunk/sys/ofed/include/rdma/sdp_socket.h
===================================================================
--- trunk/sys/ofed/include/rdma/sdp_socket.h 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/ofed/include/rdma/sdp_socket.h 2018-06-04 03:42:02 UTC (rev 10401)
@@ -4,7 +4,7 @@
#ifndef SDP_SOCKET_H
#define SDP_SOCKET_H
-#ifndef __FreeBSD__
+#ifndef __MidnightBSD__
#ifndef AF_INET_SDP
#define AF_INET_SDP 27
#define PF_INET_SDP AF_INET_SDP
Modified: trunk/sys/pci/ncr.c
===================================================================
--- trunk/sys/pci/ncr.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/pci/ncr.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -51,7 +51,7 @@
#define NCR_GETCC_WITHMSG
-#if defined (__FreeBSD__) && defined(_KERNEL)
+#if defined (__MidnightBSD__) && defined(_KERNEL)
#include "opt_ncr.h"
#endif
@@ -4373,7 +4373,7 @@
cpi->initiator_id = np->myaddr;
cpi->bus_id = cam_sim_bus(sim);
cpi->base_transfer_speed = 3300;
- strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
+ strncpy(cpi->sim_vid, "MidnightBSD", SIM_IDLEN);
strncpy(cpi->hba_vid, "Symbios", HBA_IDLEN);
strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
Modified: trunk/sys/teken/demo/teken_demo.c
===================================================================
--- trunk/sys/teken/demo/teken_demo.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/teken/demo/teken_demo.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -38,7 +38,7 @@
#include <unistd.h>
#include <ncurses.h>
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
#include <libutil.h>
#elif defined(__linux__)
#include <pty.h>
Modified: trunk/sys/teken/teken.c
===================================================================
--- trunk/sys/teken/teken.c 2018-06-04 02:48:50 UTC (rev 10400)
+++ trunk/sys/teken/teken.c 2018-06-04 03:42:02 UTC (rev 10401)
@@ -28,13 +28,13 @@
*/
#include <sys/cdefs.h>
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if defined(__MidnightBSD__) && defined(_KERNEL)
#include <sys/param.h>
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/systm.h>
#define teken_assert(x) MPASS(x)
-#else /* !(__FreeBSD__ && _KERNEL) */
+#else /* !(__MidnightBSD__ && _KERNEL) */
#include <sys/types.h>
#include <assert.h>
#include <limits.h>
@@ -42,7 +42,7 @@
#include <stdio.h>
#include <string.h>
#define teken_assert(x) assert(x)
-#endif /* __FreeBSD__ && _KERNEL */
+#endif /* __MidnightBSD__ && _KERNEL */
/* debug messages */
#define teken_printf(x,...)
More information about the Midnightbsd-cvs
mailing list