summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-11-06 08:56:38 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-11-11 10:08:04 +0100
commitf244de9638a482a2f7b6de307661d4c3bbcbf193 (patch)
tree4b7a554be590b5ea1dfca7b1a6d2953d441b0234
parent94d04f8ba8b60b7d396163269876f73593b227a5 (diff)
downloadrtems-libbsd-f244de9638a482a2f7b6de307661d4c3bbcbf193.tar.bz2
Rename rtems-bsd-config.h
Rename rtems-bsd-config.h in rtems-bsd-kernel-space.h.
-rw-r--r--.gitignore2
-rw-r--r--Makefile6
-rwxr-xr-xfreebsd-to-rtems.py10
-rw-r--r--freebsd/sys/arm/arm/in_cksum.c2
-rw-r--r--freebsd/sys/arm/arm/legacy.c2
-rw-r--r--freebsd/sys/arm/pci/pci_bus.c2
-rw-r--r--freebsd/sys/avr/avr/in_cksum.c2
-rw-r--r--freebsd/sys/avr/avr/legacy.c2
-rw-r--r--freebsd/sys/avr/pci/pci_bus.c2
-rw-r--r--freebsd/sys/bfin/bfin/in_cksum.c2
-rw-r--r--freebsd/sys/bfin/bfin/legacy.c2
-rw-r--r--freebsd/sys/bfin/pci/pci_bus.c2
-rw-r--r--freebsd/sys/cam/cam.c2
-rw-r--r--freebsd/sys/cam/scsi/scsi_all.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_cbq.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_cdnr.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_hfsc.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_priq.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_red.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_rio.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_rmclass.c2
-rw-r--r--freebsd/sys/contrib/altq/altq/altq_subr.c2
-rw-r--r--freebsd/sys/contrib/pf/net/if_pflog.c2
-rw-r--r--freebsd/sys/contrib/pf/net/if_pfsync.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_if.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_ioctl.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_norm.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_osfp.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_ruleset.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_subr.c2
-rw-r--r--freebsd/sys/contrib/pf/net/pf_table.c2
-rw-r--r--freebsd/sys/contrib/pf/netinet/in4_cksum.c2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_ecb.c2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_enc.c2
-rw-r--r--freebsd/sys/crypto/blowfish/bf_skey.c2
-rw-r--r--freebsd/sys/crypto/camellia/camellia-api.c2
-rw-r--r--freebsd/sys/crypto/camellia/camellia.c2
-rw-r--r--freebsd/sys/crypto/des/des_ecb.c2
-rw-r--r--freebsd/sys/crypto/des/des_enc.c2
-rw-r--r--freebsd/sys/crypto/des/des_setkey.c2
-rw-r--r--freebsd/sys/crypto/rc4/rc4.c2
-rw-r--r--freebsd/sys/crypto/rijndael/rijndael-alg-fst.c2
-rw-r--r--freebsd/sys/crypto/rijndael/rijndael-api-fst.c2
-rw-r--r--freebsd/sys/crypto/rijndael/rijndael-api.c2
-rw-r--r--freebsd/sys/crypto/sha1.c2
-rw-r--r--freebsd/sys/crypto/sha2/sha2.c2
-rw-r--r--freebsd/sys/dev/bce/if_bce.c2
-rw-r--r--freebsd/sys/dev/bfe/if_bfe.c2
-rw-r--r--freebsd/sys/dev/bge/if_bge.c2
-rw-r--r--freebsd/sys/dev/dc/dcphy.c2
-rw-r--r--freebsd/sys/dev/dc/if_dc.c2
-rw-r--r--freebsd/sys/dev/dc/pnphy.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_80003es2lan.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82540.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82541.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82542.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82543.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82571.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_82575.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_api.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_ich8lan.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_mac.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_manage.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_mbx.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_nvm.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_osdep.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_phy.c2
-rw-r--r--freebsd/sys/dev/e1000/e1000_vf.c2
-rw-r--r--freebsd/sys/dev/e1000/if_em.c2
-rw-r--r--freebsd/sys/dev/e1000/if_igb.c2
-rw-r--r--freebsd/sys/dev/e1000/if_lem.c2
-rw-r--r--freebsd/sys/dev/fxp/if_fxp.c2
-rw-r--r--freebsd/sys/dev/led/led.c2
-rw-r--r--freebsd/sys/dev/mii/brgphy.c2
-rw-r--r--freebsd/sys/dev/mii/icsphy.c2
-rw-r--r--freebsd/sys/dev/mii/mii.c2
-rw-r--r--freebsd/sys/dev/mii/mii_bitbang.c2
-rw-r--r--freebsd/sys/dev/mii/mii_physubr.c2
-rw-r--r--freebsd/sys/dev/pci/pci.c2
-rw-r--r--freebsd/sys/dev/pci/pci_pci.c2
-rw-r--r--freebsd/sys/dev/pci/pci_user.c2
-rw-r--r--freebsd/sys/dev/random/harvest.c2
-rw-r--r--freebsd/sys/dev/re/if_re.c2
-rw-r--r--freebsd/sys/dev/smc/if_smc.c2
-rw-r--r--freebsd/sys/dev/usb/controller/ehci.c2
-rw-r--r--freebsd/sys/dev/usb/controller/ohci.c2
-rw-r--r--freebsd/sys/dev/usb/controller/usb_controller.c2
-rw-r--r--freebsd/sys/dev/usb/quirk/usb_quirk.c2
-rw-r--r--freebsd/sys/dev/usb/storage/umass.c2
-rw-r--r--freebsd/sys/dev/usb/usb_busdma.c2
-rw-r--r--freebsd/sys/dev/usb/usb_core.c2
-rw-r--r--freebsd/sys/dev/usb/usb_debug.c2
-rw-r--r--freebsd/sys/dev/usb/usb_dev.c2
-rw-r--r--freebsd/sys/dev/usb/usb_device.c2
-rw-r--r--freebsd/sys/dev/usb/usb_dynamic.c2
-rw-r--r--freebsd/sys/dev/usb/usb_error.c2
-rw-r--r--freebsd/sys/dev/usb/usb_generic.c2
-rw-r--r--freebsd/sys/dev/usb/usb_handle_request.c2
-rw-r--r--freebsd/sys/dev/usb/usb_hid.c2
-rw-r--r--freebsd/sys/dev/usb/usb_hub.c2
-rw-r--r--freebsd/sys/dev/usb/usb_lookup.c2
-rw-r--r--freebsd/sys/dev/usb/usb_mbuf.c2
-rw-r--r--freebsd/sys/dev/usb/usb_msctest.c2
-rw-r--r--freebsd/sys/dev/usb/usb_parse.c2
-rw-r--r--freebsd/sys/dev/usb/usb_process.c2
-rw-r--r--freebsd/sys/dev/usb/usb_request.c2
-rw-r--r--freebsd/sys/dev/usb/usb_transfer.c2
-rw-r--r--freebsd/sys/dev/usb/usb_util.c2
-rw-r--r--freebsd/sys/h8300/h8300/in_cksum.c2
-rw-r--r--freebsd/sys/h8300/h8300/legacy.c2
-rw-r--r--freebsd/sys/h8300/pci/pci_bus.c2
-rw-r--r--freebsd/sys/i386/i386/in_cksum.c2
-rw-r--r--freebsd/sys/i386/i386/legacy.c2
-rw-r--r--freebsd/sys/i386/pci/pci_bus.c2
-rw-r--r--freebsd/sys/kern/init_main.c2
-rw-r--r--freebsd/sys/kern/kern_event.c2
-rw-r--r--freebsd/sys/kern/kern_hhook.c2
-rw-r--r--freebsd/sys/kern/kern_intr.c2
-rw-r--r--freebsd/sys/kern/kern_khelp.c2
-rw-r--r--freebsd/sys/kern/kern_linker.c2
-rw-r--r--freebsd/sys/kern/kern_mbuf.c2
-rw-r--r--freebsd/sys/kern/kern_mib.c2
-rw-r--r--freebsd/sys/kern/kern_module.c2
-rw-r--r--freebsd/sys/kern/kern_mtxpool.c2
-rw-r--r--freebsd/sys/kern/kern_osd.c2
-rw-r--r--freebsd/sys/kern/kern_subr.c2
-rw-r--r--freebsd/sys/kern/kern_sysctl.c2
-rw-r--r--freebsd/sys/kern/kern_time.c2
-rw-r--r--freebsd/sys/kern/kern_timeout.c2
-rw-r--r--freebsd/sys/kern/subr_bufring.c2
-rw-r--r--freebsd/sys/kern/subr_bus.c2
-rw-r--r--freebsd/sys/kern/subr_eventhandler.c2
-rw-r--r--freebsd/sys/kern/subr_hints.c2
-rw-r--r--freebsd/sys/kern/subr_kobj.c2
-rw-r--r--freebsd/sys/kern/subr_module.c2
-rw-r--r--freebsd/sys/kern/subr_rman.c2
-rw-r--r--freebsd/sys/kern/subr_sbuf.c2
-rw-r--r--freebsd/sys/kern/subr_taskqueue.c2
-rw-r--r--freebsd/sys/kern/subr_unit.c2
-rw-r--r--freebsd/sys/kern/sys_generic.c2
-rw-r--r--freebsd/sys/kern/sys_socket.c2
-rw-r--r--freebsd/sys/kern/uipc_accf.c2
-rw-r--r--freebsd/sys/kern/uipc_domain.c2
-rw-r--r--freebsd/sys/kern/uipc_mbuf.c2
-rw-r--r--freebsd/sys/kern/uipc_mbuf2.c2
-rw-r--r--freebsd/sys/kern/uipc_sockbuf.c2
-rw-r--r--freebsd/sys/kern/uipc_socket.c2
-rw-r--r--freebsd/sys/kern/uipc_syscalls.c2
-rw-r--r--freebsd/sys/libkern/arc4random.c2
-rw-r--r--freebsd/sys/libkern/fls.c2
-rw-r--r--freebsd/sys/libkern/inet_ntoa.c2
-rw-r--r--freebsd/sys/libkern/random.c2
-rw-r--r--freebsd/sys/lm32/lm32/in_cksum.c2
-rw-r--r--freebsd/sys/lm32/lm32/legacy.c2
-rw-r--r--freebsd/sys/lm32/pci/pci_bus.c2
-rw-r--r--freebsd/sys/m32c/m32c/in_cksum.c2
-rw-r--r--freebsd/sys/m32c/m32c/legacy.c2
-rw-r--r--freebsd/sys/m32c/pci/pci_bus.c2
-rw-r--r--freebsd/sys/m32r/m32r/in_cksum.c2
-rw-r--r--freebsd/sys/m32r/m32r/legacy.c2
-rw-r--r--freebsd/sys/m32r/pci/pci_bus.c2
-rw-r--r--freebsd/sys/m68k/m68k/in_cksum.c2
-rw-r--r--freebsd/sys/m68k/m68k/legacy.c2
-rw-r--r--freebsd/sys/m68k/pci/pci_bus.c2
-rw-r--r--freebsd/sys/mips/mips/in_cksum.c2
-rw-r--r--freebsd/sys/mips/mips/legacy.c2
-rw-r--r--freebsd/sys/mips/pci/pci_bus.c2
-rw-r--r--freebsd/sys/net/bpf.c2
-rw-r--r--freebsd/sys/net/bpf_buffer.c2
-rw-r--r--freebsd/sys/net/bpf_filter.c2
-rw-r--r--freebsd/sys/net/bpf_jitter.c2
-rw-r--r--freebsd/sys/net/bridgestp.c2
-rw-r--r--freebsd/sys/net/ieee8023ad_lacp.c2
-rw-r--r--freebsd/sys/net/if.c2
-rw-r--r--freebsd/sys/net/if_arcsubr.c2
-rw-r--r--freebsd/sys/net/if_atmsubr.c2
-rw-r--r--freebsd/sys/net/if_bridge.c2
-rw-r--r--freebsd/sys/net/if_clone.c2
-rw-r--r--freebsd/sys/net/if_dead.c2
-rw-r--r--freebsd/sys/net/if_disc.c2
-rw-r--r--freebsd/sys/net/if_edsc.c2
-rw-r--r--freebsd/sys/net/if_ef.c2
-rw-r--r--freebsd/sys/net/if_enc.c2
-rw-r--r--freebsd/sys/net/if_epair.c2
-rw-r--r--freebsd/sys/net/if_ethersubr.c2
-rw-r--r--freebsd/sys/net/if_faith.c2
-rw-r--r--freebsd/sys/net/if_fddisubr.c2
-rw-r--r--freebsd/sys/net/if_fwsubr.c2
-rw-r--r--freebsd/sys/net/if_gif.c2
-rw-r--r--freebsd/sys/net/if_gre.c2
-rw-r--r--freebsd/sys/net/if_iso88025subr.c2
-rw-r--r--freebsd/sys/net/if_lagg.c2
-rw-r--r--freebsd/sys/net/if_llatbl.c2
-rw-r--r--freebsd/sys/net/if_loop.c2
-rw-r--r--freebsd/sys/net/if_media.c2
-rw-r--r--freebsd/sys/net/if_mib.c2
-rw-r--r--freebsd/sys/net/if_spppfr.c2
-rw-r--r--freebsd/sys/net/if_spppsubr.c2
-rw-r--r--freebsd/sys/net/if_stf.c2
-rw-r--r--freebsd/sys/net/if_tap.c2
-rw-r--r--freebsd/sys/net/if_tun.c2
-rw-r--r--freebsd/sys/net/if_vlan.c2
-rw-r--r--freebsd/sys/net/netisr.c2
-rw-r--r--freebsd/sys/net/pfil.c2
-rw-r--r--freebsd/sys/net/radix.c2
-rw-r--r--freebsd/sys/net/radix_mpath.c2
-rw-r--r--freebsd/sys/net/raw_cb.c2
-rw-r--r--freebsd/sys/net/raw_usrreq.c2
-rw-r--r--freebsd/sys/net/route.c2
-rw-r--r--freebsd/sys/net/rtsock.c2
-rw-r--r--freebsd/sys/net/slcompress.c2
-rw-r--r--freebsd/sys/net80211/ieee80211.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_acl.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_action.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_adhoc.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ageq.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_amrr.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_crypto.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_crypto_ccmp.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_crypto_none.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_crypto_tkip.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_crypto_wep.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ddb.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_dfs.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_freebsd.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_hostap.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ht.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_hwmp.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_input.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ioctl.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_mesh.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_monitor.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_node.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_output.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_phy.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_power.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_proto.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_radiotap.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ratectl.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_ratectl_none.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_regdomain.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_rssadapt.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_scan.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_scan_sta.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_sta.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_superg.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_tdma.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_wds.c2
-rw-r--r--freebsd/sys/net80211/ieee80211_xauth.c2
-rw-r--r--freebsd/sys/netatalk/aarp.c2
-rw-r--r--freebsd/sys/netatalk/at_control.c2
-rw-r--r--freebsd/sys/netatalk/at_proto.c2
-rw-r--r--freebsd/sys/netatalk/at_rmx.c2
-rw-r--r--freebsd/sys/netatalk/ddp_input.c2
-rw-r--r--freebsd/sys/netatalk/ddp_output.c2
-rw-r--r--freebsd/sys/netatalk/ddp_pcb.c2
-rw-r--r--freebsd/sys/netatalk/ddp_usrreq.c2
-rw-r--r--freebsd/sys/netinet/accf_data.c2
-rw-r--r--freebsd/sys/netinet/accf_dns.c2
-rw-r--r--freebsd/sys/netinet/accf_http.c2
-rw-r--r--freebsd/sys/netinet/cc/cc.c2
-rw-r--r--freebsd/sys/netinet/cc/cc_newreno.c2
-rw-r--r--freebsd/sys/netinet/if_atm.c2
-rw-r--r--freebsd/sys/netinet/if_ether.c2
-rw-r--r--freebsd/sys/netinet/igmp.c2
-rw-r--r--freebsd/sys/netinet/in.c2
-rw-r--r--freebsd/sys/netinet/in_gif.c2
-rw-r--r--freebsd/sys/netinet/in_mcast.c2
-rw-r--r--freebsd/sys/netinet/in_pcb.c2
-rw-r--r--freebsd/sys/netinet/in_proto.c2
-rw-r--r--freebsd/sys/netinet/in_rmx.c2
-rw-r--r--freebsd/sys/netinet/ip_carp.c2
-rw-r--r--freebsd/sys/netinet/ip_divert.c2
-rw-r--r--freebsd/sys/netinet/ip_ecn.c2
-rw-r--r--freebsd/sys/netinet/ip_encap.c2
-rw-r--r--freebsd/sys/netinet/ip_fastfwd.c2
-rw-r--r--freebsd/sys/netinet/ip_gre.c2
-rw-r--r--freebsd/sys/netinet/ip_icmp.c2
-rw-r--r--freebsd/sys/netinet/ip_id.c2
-rw-r--r--freebsd/sys/netinet/ip_input.c2
-rw-r--r--freebsd/sys/netinet/ip_ipsec.c2
-rw-r--r--freebsd/sys/netinet/ip_mroute.c2
-rw-r--r--freebsd/sys/netinet/ip_options.c2
-rw-r--r--freebsd/sys/netinet/ip_output.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_heap.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_sched_fifo.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_sched_prio.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_sched_qfq.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_sched_rr.c2
-rw-r--r--freebsd/sys/netinet/ipfw/dn_sched_wf2q.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_dn_glue.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_dn_io.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_dummynet.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw2.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw_log.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw_nat.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw_pfil.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw_sockopt.c2
-rw-r--r--freebsd/sys/netinet/ipfw/ip_fw_table.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_cuseeme.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_db.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_dummy.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_ftp.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_irc.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_mod.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_nbt.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_pptp.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_proxy.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_sctp.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_skinny.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_smedia.c2
-rw-r--r--freebsd/sys/netinet/libalias/alias_util.c2
-rw-r--r--freebsd/sys/netinet/raw_ip.c2
-rw-r--r--freebsd/sys/netinet/sctp_asconf.c2
-rw-r--r--freebsd/sys/netinet/sctp_auth.c2
-rw-r--r--freebsd/sys/netinet/sctp_bsd_addr.c2
-rw-r--r--freebsd/sys/netinet/sctp_cc_functions.c2
-rw-r--r--freebsd/sys/netinet/sctp_crc32.c2
-rw-r--r--freebsd/sys/netinet/sctp_indata.c2
-rw-r--r--freebsd/sys/netinet/sctp_input.c2
-rw-r--r--freebsd/sys/netinet/sctp_output.c2
-rw-r--r--freebsd/sys/netinet/sctp_pcb.c2
-rw-r--r--freebsd/sys/netinet/sctp_peeloff.c2
-rw-r--r--freebsd/sys/netinet/sctp_sysctl.c2
-rw-r--r--freebsd/sys/netinet/sctp_timer.c2
-rw-r--r--freebsd/sys/netinet/sctp_usrreq.c2
-rw-r--r--freebsd/sys/netinet/sctputil.c2
-rw-r--r--freebsd/sys/netinet/tcp_debug.c2
-rw-r--r--freebsd/sys/netinet/tcp_hostcache.c2
-rw-r--r--freebsd/sys/netinet/tcp_input.c2
-rw-r--r--freebsd/sys/netinet/tcp_lro.c2
-rw-r--r--freebsd/sys/netinet/tcp_offload.c2
-rw-r--r--freebsd/sys/netinet/tcp_output.c2
-rw-r--r--freebsd/sys/netinet/tcp_reass.c2
-rw-r--r--freebsd/sys/netinet/tcp_sack.c2
-rw-r--r--freebsd/sys/netinet/tcp_subr.c2
-rw-r--r--freebsd/sys/netinet/tcp_syncache.c2
-rw-r--r--freebsd/sys/netinet/tcp_timer.c2
-rw-r--r--freebsd/sys/netinet/tcp_timewait.c2
-rw-r--r--freebsd/sys/netinet/tcp_usrreq.c2
-rw-r--r--freebsd/sys/netinet/udp_usrreq.c2
-rw-r--r--freebsd/sys/netinet6/dest6.c2
-rw-r--r--freebsd/sys/netinet6/frag6.c2
-rw-r--r--freebsd/sys/netinet6/icmp6.c2
-rw-r--r--freebsd/sys/netinet6/in6.c2
-rw-r--r--freebsd/sys/netinet6/in6_cksum.c2
-rw-r--r--freebsd/sys/netinet6/in6_gif.c2
-rw-r--r--freebsd/sys/netinet6/in6_ifattach.c2
-rw-r--r--freebsd/sys/netinet6/in6_mcast.c2
-rw-r--r--freebsd/sys/netinet6/in6_pcb.c2
-rw-r--r--freebsd/sys/netinet6/in6_proto.c2
-rw-r--r--freebsd/sys/netinet6/in6_rmx.c2
-rw-r--r--freebsd/sys/netinet6/in6_src.c2
-rw-r--r--freebsd/sys/netinet6/ip6_forward.c2
-rw-r--r--freebsd/sys/netinet6/ip6_id.c2
-rw-r--r--freebsd/sys/netinet6/ip6_input.c2
-rw-r--r--freebsd/sys/netinet6/ip6_ipsec.c2
-rw-r--r--freebsd/sys/netinet6/ip6_mroute.c2
-rw-r--r--freebsd/sys/netinet6/ip6_output.c2
-rw-r--r--freebsd/sys/netinet6/mld6.c2
-rw-r--r--freebsd/sys/netinet6/nd6.c2
-rw-r--r--freebsd/sys/netinet6/nd6_nbr.c2
-rw-r--r--freebsd/sys/netinet6/nd6_rtr.c2
-rw-r--r--freebsd/sys/netinet6/raw_ip6.c2
-rw-r--r--freebsd/sys/netinet6/route6.c2
-rw-r--r--freebsd/sys/netinet6/scope6.c2
-rw-r--r--freebsd/sys/netinet6/sctp6_usrreq.c2
-rw-r--r--freebsd/sys/netinet6/udp6_usrreq.c2
-rw-r--r--freebsd/sys/netipsec/ipsec.c2
-rw-r--r--freebsd/sys/netipsec/ipsec_input.c2
-rw-r--r--freebsd/sys/netipsec/ipsec_mbuf.c2
-rw-r--r--freebsd/sys/netipsec/ipsec_output.c2
-rw-r--r--freebsd/sys/netipsec/key.c2
-rw-r--r--freebsd/sys/netipsec/key_debug.c2
-rw-r--r--freebsd/sys/netipsec/keysock.c2
-rw-r--r--freebsd/sys/netipsec/xform_ah.c2
-rw-r--r--freebsd/sys/netipsec/xform_esp.c2
-rw-r--r--freebsd/sys/netipsec/xform_ipcomp.c2
-rw-r--r--freebsd/sys/netipsec/xform_ipip.c2
-rw-r--r--freebsd/sys/netipsec/xform_tcp.c2
-rw-r--r--freebsd/sys/nios2/nios2/in_cksum.c2
-rw-r--r--freebsd/sys/nios2/nios2/legacy.c2
-rw-r--r--freebsd/sys/nios2/pci/pci_bus.c2
-rw-r--r--freebsd/sys/opencrypto/cast.c2
-rw-r--r--freebsd/sys/opencrypto/criov.c2
-rw-r--r--freebsd/sys/opencrypto/crypto.c2
-rw-r--r--freebsd/sys/opencrypto/cryptodev.c2
-rw-r--r--freebsd/sys/opencrypto/cryptosoft.c2
-rw-r--r--freebsd/sys/opencrypto/deflate.c2
-rw-r--r--freebsd/sys/opencrypto/rmd160.c2
-rw-r--r--freebsd/sys/opencrypto/skipjack.c2
-rw-r--r--freebsd/sys/opencrypto/xform.c2
-rw-r--r--freebsd/sys/powerpc/pci/pci_bus.c2
-rw-r--r--freebsd/sys/powerpc/powerpc/in_cksum.c2
-rw-r--r--freebsd/sys/powerpc/powerpc/legacy.c2
-rw-r--r--freebsd/sys/sh/pci/pci_bus.c2
-rw-r--r--freebsd/sys/sh/sh/in_cksum.c2
-rw-r--r--freebsd/sys/sh/sh/legacy.c2
-rw-r--r--freebsd/sys/sparc/pci/pci_bus.c2
-rw-r--r--freebsd/sys/sparc/sparc/in_cksum.c2
-rw-r--r--freebsd/sys/sparc/sparc/legacy.c2
-rw-r--r--freebsd/sys/sparc64/pci/pci_bus.c2
-rw-r--r--freebsd/sys/sparc64/sparc64/in_cksum.c2
-rw-r--r--freebsd/sys/sparc64/sparc64/legacy.c2
-rw-r--r--freebsd/sys/v850/pci/pci_bus.c2
-rw-r--r--freebsd/sys/v850/v850/in_cksum.c2
-rw-r--r--freebsd/sys/v850/v850/legacy.c2
-rw-r--r--freebsd/sys/vm/uma_core.c2
-rw-r--r--rtemsbsd/include/machine/atomic.h4
-rw-r--r--rtemsbsd/include/machine/bus.h4
-rw-r--r--rtemsbsd/include/machine/bus_dma.h4
-rw-r--r--rtemsbsd/include/machine/clock.h4
-rw-r--r--rtemsbsd/include/machine/cpu.h4
-rw-r--r--rtemsbsd/include/machine/proc.h4
-rw-r--r--rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in (renamed from rtemsbsd/include/machine/rtems-bsd-config.h.in)6
-rw-r--r--rtemsbsd/include/machine/runq.h4
-rw-r--r--rtemsbsd/include/machine/signal.h4
-rw-r--r--rtemsbsd/include/machine/stdarg.h4
-rw-r--r--rtemsbsd/include/machine/ucontext.h4
-rw-r--r--rtemsbsd/local/bus_if.c2
-rw-r--r--rtemsbsd/local/cryptodev_if.c2
-rw-r--r--rtemsbsd/local/device_if.c2
-rw-r--r--rtemsbsd/local/miibus_if.c2
-rw-r--r--rtemsbsd/local/pci_if.c2
-rw-r--r--rtemsbsd/local/pcib_if.c2
-rw-r--r--rtemsbsd/local/usb_if.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-assert.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-autoconf.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-bus-dma.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-cam.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-chunk.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-condvar.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-conf.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-delay.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-generic.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-get-file.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-init-with-irq.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-init.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-jail.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-kern_synch.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-lock.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-log.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-malloc.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-mutex.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-nexus.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-panic.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-pci_bus.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-program.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-rwlock.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-shell.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-signal.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-support.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-sx.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-sysctl.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-sysctlbyname.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-thread.c2
-rw-r--r--rtemsbsd/rtems/rtems-bsd-timesupport.c2
-rw-r--r--rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c2
-rw-r--r--rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c2
-rw-r--r--rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c2
-rw-r--r--testsuite/rwlock01/test_main.c2
-rw-r--r--testsuite/sleep01/test_main.c2
-rw-r--r--testsuite/swi01/swi_test.c2
-rw-r--r--testsuite/thread01/test_main.c2
-rw-r--r--testsuite/timeout01/timeout_test.c2
470 files changed, 488 insertions, 488 deletions
diff --git a/.gitignore b/.gitignore
index 5c27dbc2..f1ff1cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ freebsd/lib/libc/net/nsparser.h
freebsd/lib/libc/net/nslexer.c
freebsd/lib/libc/net/nsparser.c
rtemsbsd/rtems/rtems-kvm-symbols.c
-rtemsbsd/include/machine/rtems-bsd-config.h
+rtemsbsd/include/machine/rtems-bsd-kernel-space.h
/*.i
/*.s
/log
diff --git a/Makefile b/Makefile
index 77b40a25..e2f14ca9 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99
CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d
NEED_DUMMY_PIC_IRQ=yes
-# do nothing default so sed on rtems-bsd-config.h always works.
+# do nothing default so sed on rtems-bsd-kernel-space.h always works.
SED_PATTERN += -e 's/^//'
TESTS =
@@ -39,7 +39,7 @@ O_FILES =
D_FILES =
LIB = libbsd.a
-LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-config.h
+LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h
LIB_C_FILES =
LIB_C_FILES += rtemsbsd/local/bus_if.c
LIB_C_FILES += rtemsbsd/local/cryptodev_if.c
@@ -942,7 +942,7 @@ run_tests: $(RUN_TESTS)
check_endof
# The following targets use the MIPS Generic in_cksum routine
-rtemsbsd/include/machine/rtems-bsd-config.h: rtemsbsd/include/machine/rtems-bsd-config.h.in
+rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
sed $(SED_PATTERN) <$< >$@
CPU_SED = sed
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index f6408380..b1f8a945 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -235,7 +235,7 @@ class FromFreeBSDToRTEMSSourceConverter(Converter):
data = super(FromFreeBSDToRTEMSSourceConverter, self).convert(src)
data = fixLocalIncludes(data)
data = fixIncludes(data)
- data = '#include <machine/rtems-bsd-config.h>\n\n' + data
+ data = '#include <machine/rtems-bsd-kernel-space.h>\n\n' + data
return data
class FromFreeBSDToRTEMSUserSpaceSourceConverter(Converter):
@@ -254,7 +254,7 @@ class FromRTEMSToFreeBSDHeaderConverter(Converter):
class FromRTEMSToFreeBSDSourceConverter(Converter):
def convert(self, src):
data = super(FromRTEMSToFreeBSDSourceConverter, self).convert(src)
- data = re.sub('#include <machine/rtems-bsd-config.h>\n\n', '', data)
+ data = re.sub('#include <machine/rtems-bsd-kernel-space.h>\n\n', '', data)
data = revertFixLocalIncludes(data)
data = revertFixIncludes(data)
return data
@@ -411,7 +411,7 @@ class ModuleManager:
'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \
'NEED_DUMMY_PIC_IRQ=yes\n' \
'\n' \
- '# do nothing default so sed on rtems-bsd-config.h always works.\n' \
+ '# do nothing default so sed on rtems-bsd-kernel-space.h always works.\n' \
'SED_PATTERN += -e \'s/^//\'\n' \
'\n' \
'TESTS =\n' \
@@ -420,7 +420,7 @@ class ModuleManager:
'D_FILES =\n' \
'\n' \
'LIB = libbsd.a\n' \
- 'LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-config.h\n' \
+ 'LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h\n' \
'LIB_C_FILES =\n'
for m in self.modules:
if m.conditionalOn != "none":
@@ -456,7 +456,7 @@ class ModuleManager:
'\tcheck_endof\n' \
'\n' \
'# The following targets use the MIPS Generic in_cksum routine\n' \
- 'rtemsbsd/include/machine/rtems-bsd-config.h: rtemsbsd/include/machine/rtems-bsd-config.h.in\n' \
+ 'rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in\n' \
'\tsed $(SED_PATTERN) <$< >$@\n' \
'\n' \
'CPU_SED = sed\n' \
diff --git a/freebsd/sys/arm/arm/in_cksum.c b/freebsd/sys/arm/arm/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/arm/arm/in_cksum.c
+++ b/freebsd/sys/arm/arm/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/arm/arm/legacy.c b/freebsd/sys/arm/arm/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/arm/arm/legacy.c
+++ b/freebsd/sys/arm/arm/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/arm/pci/pci_bus.c b/freebsd/sys/arm/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/arm/pci/pci_bus.c
+++ b/freebsd/sys/arm/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/avr/avr/in_cksum.c b/freebsd/sys/avr/avr/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/avr/avr/in_cksum.c
+++ b/freebsd/sys/avr/avr/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/avr/avr/legacy.c b/freebsd/sys/avr/avr/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/avr/avr/legacy.c
+++ b/freebsd/sys/avr/avr/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/avr/pci/pci_bus.c b/freebsd/sys/avr/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/avr/pci/pci_bus.c
+++ b/freebsd/sys/avr/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/bfin/bfin/in_cksum.c b/freebsd/sys/bfin/bfin/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/bfin/bfin/in_cksum.c
+++ b/freebsd/sys/bfin/bfin/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/bfin/bfin/legacy.c b/freebsd/sys/bfin/bfin/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/bfin/bfin/legacy.c
+++ b/freebsd/sys/bfin/bfin/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/bfin/pci/pci_bus.c b/freebsd/sys/bfin/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/bfin/pci/pci_bus.c
+++ b/freebsd/sys/bfin/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/cam/cam.c b/freebsd/sys/cam/cam.c
index 5b21ae8a..6d22945a 100644
--- a/freebsd/sys/cam/cam.c
+++ b/freebsd/sys/cam/cam.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Generic utility routines for the Common Access Method layer.
diff --git a/freebsd/sys/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c
index bf002dbe..151ebb10 100644
--- a/freebsd/sys/cam/scsi/scsi_all.c
+++ b/freebsd/sys/cam/scsi/scsi_all.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Implementation of Utility functions for all SCSI device types.
diff --git a/freebsd/sys/contrib/altq/altq/altq_cbq.c b/freebsd/sys/contrib/altq/altq/altq_cbq.c
index 7991c0f5..9dde791c 100644
--- a/freebsd/sys/contrib/altq/altq/altq_cbq.c
+++ b/freebsd/sys/contrib/altq/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_cdnr.c b/freebsd/sys/contrib/altq/altq/altq_cdnr.c
index 426e8ddf..cc37e0b8 100644
--- a/freebsd/sys/contrib/altq/altq/altq_cdnr.c
+++ b/freebsd/sys/contrib/altq/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_hfsc.c b/freebsd/sys/contrib/altq/altq/altq_hfsc.c
index c4648af3..41f7c6db 100644
--- a/freebsd/sys/contrib/altq/altq/altq_hfsc.c
+++ b/freebsd/sys/contrib/altq/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_priq.c b/freebsd/sys/contrib/altq/altq/altq_priq.c
index 0bc6f453..e0e2522d 100644
--- a/freebsd/sys/contrib/altq/altq/altq_priq.c
+++ b/freebsd/sys/contrib/altq/altq/altq_priq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_red.c b/freebsd/sys/contrib/altq/altq/altq_red.c
index 7491c2f0..78b8e6fc 100644
--- a/freebsd/sys/contrib/altq/altq/altq_red.c
+++ b/freebsd/sys/contrib/altq/altq/altq_red.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_rio.c b/freebsd/sys/contrib/altq/altq/altq_rio.c
index a24c9006..d1fe3f18 100644
--- a/freebsd/sys/contrib/altq/altq/altq_rio.c
+++ b/freebsd/sys/contrib/altq/altq/altq_rio.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_rmclass.c b/freebsd/sys/contrib/altq/altq/altq_rmclass.c
index 390d7308..6550dda4 100644
--- a/freebsd/sys/contrib/altq/altq/altq_rmclass.c
+++ b/freebsd/sys/contrib/altq/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $ */
diff --git a/freebsd/sys/contrib/altq/altq/altq_subr.c b/freebsd/sys/contrib/altq/altq/altq_subr.c
index b6e20082..3168da74 100644
--- a/freebsd/sys/contrib/altq/altq/altq_subr.c
+++ b/freebsd/sys/contrib/altq/altq/altq_subr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/if_pflog.c b/freebsd/sys/contrib/pf/net/if_pflog.c
index a05c6435..8e33eaf3 100644
--- a/freebsd/sys/contrib/pf/net/if_pflog.c
+++ b/freebsd/sys/contrib/pf/net/if_pflog.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $ */
/*
diff --git a/freebsd/sys/contrib/pf/net/if_pfsync.c b/freebsd/sys/contrib/pf/net/if_pfsync.c
index c3b830be..f4fe498f 100644
--- a/freebsd/sys/contrib/pf/net/if_pfsync.c
+++ b/freebsd/sys/contrib/pf/net/if_pfsync.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: if_pfsync.c,v 1.73 2006/11/16 13:13:38 henning Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c
index 0f80c4d7..e24cd26c 100644
--- a/freebsd/sys/contrib/pf/net/pf.c
+++ b/freebsd/sys/contrib/pf/net/pf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */
/* add: $OpenBSD: pf.c,v 1.559 2007/09/18 18:45:59 markus Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_if.c b/freebsd/sys/contrib/pf/net/pf_if.c
index 97c036cb..8ff3c614 100644
--- a/freebsd/sys/contrib/pf/net/pf_if.c
+++ b/freebsd/sys/contrib/pf/net/pf_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_if.c,v 1.46 2006/12/13 09:01:59 itojun Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_ioctl.c b/freebsd/sys/contrib/pf/net/pf_ioctl.c
index 95578f68..b380701e 100644
--- a/freebsd/sys/contrib/pf/net/pf_ioctl.c
+++ b/freebsd/sys/contrib/pf/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_ioctl.c,v 1.175 2007/02/26 22:47:43 deraadt Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_norm.c b/freebsd/sys/contrib/pf/net/pf_norm.c
index bf0b6046..de0ff245 100644
--- a/freebsd/sys/contrib/pf/net/pf_norm.c
+++ b/freebsd/sys/contrib/pf/net/pf_norm.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_norm.c,v 1.107 2006/04/16 00:59:52 pascoe Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_osfp.c b/freebsd/sys/contrib/pf/net/pf_osfp.c
index 67486b2d..0995797a 100644
--- a/freebsd/sys/contrib/pf/net/pf_osfp.c
+++ b/freebsd/sys/contrib/pf/net/pf_osfp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_osfp.c,v 1.12 2006/12/13 18:14:10 itojun Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_ruleset.c b/freebsd/sys/contrib/pf/net/pf_ruleset.c
index 8e0b65c8..5e018b48 100644
--- a/freebsd/sys/contrib/pf/net/pf_ruleset.c
+++ b/freebsd/sys/contrib/pf/net/pf_ruleset.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_ruleset.c,v 1.1 2006/10/27 13:56:51 mcbride Exp $ */
diff --git a/freebsd/sys/contrib/pf/net/pf_subr.c b/freebsd/sys/contrib/pf/net/pf_subr.c
index c46d61f2..cf562ce9 100644
--- a/freebsd/sys/contrib/pf/net/pf_subr.c
+++ b/freebsd/sys/contrib/pf/net/pf_subr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/contrib/pf/net/pf_table.c b/freebsd/sys/contrib/pf/net/pf_table.c
index bfe98b11..ee13e851 100644
--- a/freebsd/sys/contrib/pf/net/pf_table.c
+++ b/freebsd/sys/contrib/pf/net/pf_table.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: pf_table.c,v 1.68 2006/05/02 10:08:45 dhartmei Exp $ */
diff --git a/freebsd/sys/contrib/pf/netinet/in4_cksum.c b/freebsd/sys/contrib/pf/netinet/in4_cksum.c
index de81173f..9b4a5360 100644
--- a/freebsd/sys/contrib/pf/netinet/in4_cksum.c
+++ b/freebsd/sys/contrib/pf/netinet/in4_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: in4_cksum.c,v 1.7 2003/06/02 23:28:13 millert Exp $ */
diff --git a/freebsd/sys/crypto/blowfish/bf_ecb.c b/freebsd/sys/crypto/blowfish/bf_ecb.c
index 53b1c307..874de5ac 100644
--- a/freebsd/sys/crypto/blowfish/bf_ecb.c
+++ b/freebsd/sys/crypto/blowfish/bf_ecb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* crypto/bf/bf_ecb.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
diff --git a/freebsd/sys/crypto/blowfish/bf_enc.c b/freebsd/sys/crypto/blowfish/bf_enc.c
index 3629f433..19f58101 100644
--- a/freebsd/sys/crypto/blowfish/bf_enc.c
+++ b/freebsd/sys/crypto/blowfish/bf_enc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: bf_enc.c,v 1.7 2002/02/27 01:33:59 itojun Exp $ */
diff --git a/freebsd/sys/crypto/blowfish/bf_skey.c b/freebsd/sys/crypto/blowfish/bf_skey.c
index 86720555..a396d879 100644
--- a/freebsd/sys/crypto/blowfish/bf_skey.c
+++ b/freebsd/sys/crypto/blowfish/bf_skey.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: bf_skey.c,v 1.7 2002/02/27 01:33:59 itojun Exp $ */
diff --git a/freebsd/sys/crypto/camellia/camellia-api.c b/freebsd/sys/crypto/camellia/camellia-api.c
index 82e7a61c..f5246f5c 100644
--- a/freebsd/sys/crypto/camellia/camellia-api.c
+++ b/freebsd/sys/crypto/camellia/camellia-api.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
*
diff --git a/freebsd/sys/crypto/camellia/camellia.c b/freebsd/sys/crypto/camellia/camellia.c
index 6d01a512..45b660ef 100644
--- a/freebsd/sys/crypto/camellia/camellia.c
+++ b/freebsd/sys/crypto/camellia/camellia.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* camellia.h ver 1.1.0
*
diff --git a/freebsd/sys/crypto/des/des_ecb.c b/freebsd/sys/crypto/des/des_ecb.c
index 7b950e55..82dc18b0 100644
--- a/freebsd/sys/crypto/des/des_ecb.c
+++ b/freebsd/sys/crypto/des/des_ecb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: des_ecb.c,v 1.6 2001/09/10 04:03:58 itojun Exp $ */
diff --git a/freebsd/sys/crypto/des/des_enc.c b/freebsd/sys/crypto/des/des_enc.c
index fca59b3a..e45c7b43 100644
--- a/freebsd/sys/crypto/des/des_enc.c
+++ b/freebsd/sys/crypto/des/des_enc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: des_enc.c,v 1.1 2001/09/10 04:03:58 itojun Exp $ */
diff --git a/freebsd/sys/crypto/des/des_setkey.c b/freebsd/sys/crypto/des/des_setkey.c
index b8519ef2..6d6c2da2 100644
--- a/freebsd/sys/crypto/des/des_setkey.c
+++ b/freebsd/sys/crypto/des/des_setkey.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: des_setkey.c,v 1.7 2001/09/10 04:03:58 itojun Exp $ */
diff --git a/freebsd/sys/crypto/rc4/rc4.c b/freebsd/sys/crypto/rc4/rc4.c
index ce62c712..46f5bc37 100644
--- a/freebsd/sys/crypto/rc4/rc4.c
+++ b/freebsd/sys/crypto/rc4/rc4.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* rc4.c
diff --git a/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c b/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
index 14ac56ba..3db35498 100644
--- a/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/freebsd/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: rijndael-alg-fst.c,v 1.10 2003/07/15 10:47:16 itojun Exp $ */
/**
diff --git a/freebsd/sys/crypto/rijndael/rijndael-api-fst.c b/freebsd/sys/crypto/rijndael/rijndael-api-fst.c
index e715c9b7..72e07840 100644
--- a/freebsd/sys/crypto/rijndael/rijndael-api-fst.c
+++ b/freebsd/sys/crypto/rijndael/rijndael-api-fst.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: rijndael-api-fst.c,v 1.10 2001/05/27 09:34:18 itojun Exp $ */
diff --git a/freebsd/sys/crypto/rijndael/rijndael-api.c b/freebsd/sys/crypto/rijndael/rijndael-api.c
index 46823e7d..e99c58b7 100644
--- a/freebsd/sys/crypto/rijndael/rijndael-api.c
+++ b/freebsd/sys/crypto/rijndael/rijndael-api.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: rijndael.c,v 1.3 2003/08/28 14:20:22 itojun Exp $ */
diff --git a/freebsd/sys/crypto/sha1.c b/freebsd/sys/crypto/sha1.c
index a850eb60..f2c5330f 100644
--- a/freebsd/sys/crypto/sha1.c
+++ b/freebsd/sys/crypto/sha1.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */
/*
diff --git a/freebsd/sys/crypto/sha2/sha2.c b/freebsd/sys/crypto/sha2/sha2.c
index 32f4bca6..acabc958 100644
--- a/freebsd/sys/crypto/sha2/sha2.c
+++ b/freebsd/sys/crypto/sha2/sha2.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */
diff --git a/freebsd/sys/dev/bce/if_bce.c b/freebsd/sys/dev/bce/if_bce.c
index 313a1bc8..21ef5dc7 100644
--- a/freebsd/sys/dev/bce/if_bce.c
+++ b/freebsd/sys/dev/bce/if_bce.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2006-2010 Broadcom Corporation
diff --git a/freebsd/sys/dev/bfe/if_bfe.c b/freebsd/sys/dev/bfe/if_bfe.c
index d793c054..6d5ce427 100644
--- a/freebsd/sys/dev/bfe/if_bfe.c
+++ b/freebsd/sys/dev/bfe/if_bfe.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2003 Stuart Walsh<stu@ipng.org.uk>
diff --git a/freebsd/sys/dev/bge/if_bge.c b/freebsd/sys/dev/bge/if_bge.c
index 14a90eb7..75912967 100644
--- a/freebsd/sys/dev/bge/if_bge.c
+++ b/freebsd/sys/dev/bge/if_bge.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Wind River Systems
diff --git a/freebsd/sys/dev/dc/dcphy.c b/freebsd/sys/dev/dc/dcphy.c
index b1fe5545..9df39476 100644
--- a/freebsd/sys/dev/dc/dcphy.c
+++ b/freebsd/sys/dev/dc/dcphy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, 1998, 1999
diff --git a/freebsd/sys/dev/dc/if_dc.c b/freebsd/sys/dev/dc/if_dc.c
index 37bc2d42..575721c6 100644
--- a/freebsd/sys/dev/dc/if_dc.c
+++ b/freebsd/sys/dev/dc/if_dc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, 1998, 1999
diff --git a/freebsd/sys/dev/dc/pnphy.c b/freebsd/sys/dev/dc/pnphy.c
index 0b589e82..c303f9bf 100644
--- a/freebsd/sys/dev/dc/pnphy.c
+++ b/freebsd/sys/dev/dc/pnphy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 1997, 1998, 1999
diff --git a/freebsd/sys/dev/e1000/e1000_80003es2lan.c b/freebsd/sys/dev/e1000/e1000_80003es2lan.c
index 79950c8a..cf8fef3b 100644
--- a/freebsd/sys/dev/e1000/e1000_80003es2lan.c
+++ b/freebsd/sys/dev/e1000/e1000_80003es2lan.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82540.c b/freebsd/sys/dev/e1000/e1000_82540.c
index e8c46f3b..fabc2652 100644
--- a/freebsd/sys/dev/e1000/e1000_82540.c
+++ b/freebsd/sys/dev/e1000/e1000_82540.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82541.c b/freebsd/sys/dev/e1000/e1000_82541.c
index a3c05f82..7a02b59f 100644
--- a/freebsd/sys/dev/e1000/e1000_82541.c
+++ b/freebsd/sys/dev/e1000/e1000_82541.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82542.c b/freebsd/sys/dev/e1000/e1000_82542.c
index 4d6986ac..bbcfcbf6 100644
--- a/freebsd/sys/dev/e1000/e1000_82542.c
+++ b/freebsd/sys/dev/e1000/e1000_82542.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82543.c b/freebsd/sys/dev/e1000/e1000_82543.c
index f0b58519..0d9f9e14 100644
--- a/freebsd/sys/dev/e1000/e1000_82543.c
+++ b/freebsd/sys/dev/e1000/e1000_82543.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82571.c b/freebsd/sys/dev/e1000/e1000_82571.c
index fe87aa71..28889c15 100644
--- a/freebsd/sys/dev/e1000/e1000_82571.c
+++ b/freebsd/sys/dev/e1000/e1000_82571.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_82575.c b/freebsd/sys/dev/e1000/e1000_82575.c
index c7d00b54..2910c078 100644
--- a/freebsd/sys/dev/e1000/e1000_82575.c
+++ b/freebsd/sys/dev/e1000/e1000_82575.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_api.c b/freebsd/sys/dev/e1000/e1000_api.c
index 5fec9941..009a89cc 100644
--- a/freebsd/sys/dev/e1000/e1000_api.c
+++ b/freebsd/sys/dev/e1000/e1000_api.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_ich8lan.c b/freebsd/sys/dev/e1000/e1000_ich8lan.c
index 44e09538..e58e2606 100644
--- a/freebsd/sys/dev/e1000/e1000_ich8lan.c
+++ b/freebsd/sys/dev/e1000/e1000_ich8lan.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_mac.c b/freebsd/sys/dev/e1000/e1000_mac.c
index 2d59acce..9c5a812a 100644
--- a/freebsd/sys/dev/e1000/e1000_mac.c
+++ b/freebsd/sys/dev/e1000/e1000_mac.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_manage.c b/freebsd/sys/dev/e1000/e1000_manage.c
index 1646f435..59f53428 100644
--- a/freebsd/sys/dev/e1000/e1000_manage.c
+++ b/freebsd/sys/dev/e1000/e1000_manage.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_mbx.c b/freebsd/sys/dev/e1000/e1000_mbx.c
index 7408d814..a4c1e5e4 100644
--- a/freebsd/sys/dev/e1000/e1000_mbx.c
+++ b/freebsd/sys/dev/e1000/e1000_mbx.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_nvm.c b/freebsd/sys/dev/e1000/e1000_nvm.c
index 370dca32..633ba998 100644
--- a/freebsd/sys/dev/e1000/e1000_nvm.c
+++ b/freebsd/sys/dev/e1000/e1000_nvm.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_osdep.c b/freebsd/sys/dev/e1000/e1000_osdep.c
index 2d59a9db..97619732 100644
--- a/freebsd/sys/dev/e1000/e1000_osdep.c
+++ b/freebsd/sys/dev/e1000/e1000_osdep.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_phy.c b/freebsd/sys/dev/e1000/e1000_phy.c
index 73f03d74..c808a020 100644
--- a/freebsd/sys/dev/e1000/e1000_phy.c
+++ b/freebsd/sys/dev/e1000/e1000_phy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/e1000_vf.c b/freebsd/sys/dev/e1000/e1000_vf.c
index c5fab9b3..4f314c0b 100644
--- a/freebsd/sys/dev/e1000/e1000_vf.c
+++ b/freebsd/sys/dev/e1000/e1000_vf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/if_em.c b/freebsd/sys/dev/e1000/if_em.c
index 330b67bf..93ddafd6 100644
--- a/freebsd/sys/dev/e1000/if_em.c
+++ b/freebsd/sys/dev/e1000/if_em.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/if_igb.c b/freebsd/sys/dev/e1000/if_igb.c
index bf88f60f..c64a058d 100644
--- a/freebsd/sys/dev/e1000/if_igb.c
+++ b/freebsd/sys/dev/e1000/if_igb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/e1000/if_lem.c b/freebsd/sys/dev/e1000/if_lem.c
index 4c4bbf2d..9ed7b8e8 100644
--- a/freebsd/sys/dev/e1000/if_lem.c
+++ b/freebsd/sys/dev/e1000/if_lem.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/******************************************************************************
diff --git a/freebsd/sys/dev/fxp/if_fxp.c b/freebsd/sys/dev/fxp/if_fxp.c
index 2b1f51d6..c67d4827 100644
--- a/freebsd/sys/dev/fxp/if_fxp.c
+++ b/freebsd/sys/dev/fxp/if_fxp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1995, David Greenman
diff --git a/freebsd/sys/dev/led/led.c b/freebsd/sys/dev/led/led.c
index c87f7f9d..1b01132f 100644
--- a/freebsd/sys/dev/led/led.c
+++ b/freebsd/sys/dev/led/led.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* ----------------------------------------------------------------------------
diff --git a/freebsd/sys/dev/mii/brgphy.c b/freebsd/sys/dev/mii/brgphy.c
index bd80e61e..e21e783e 100644
--- a/freebsd/sys/dev/mii/brgphy.c
+++ b/freebsd/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000
diff --git a/freebsd/sys/dev/mii/icsphy.c b/freebsd/sys/dev/mii/icsphy.c
index 3c178c52..47474db7 100644
--- a/freebsd/sys/dev/mii/icsphy.c
+++ b/freebsd/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: icsphy.c,v 1.41 2006/11/16 21:24:07 christos Exp $ */
diff --git a/freebsd/sys/dev/mii/mii.c b/freebsd/sys/dev/mii/mii.c
index 2e2e6c79..e3a3ec84 100644
--- a/freebsd/sys/dev/mii/mii.c
+++ b/freebsd/sys/dev/mii/mii.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: mii.c,v 1.12 1999/08/03 19:41:49 drochner Exp $ */
diff --git a/freebsd/sys/dev/mii/mii_bitbang.c b/freebsd/sys/dev/mii/mii_bitbang.c
index df9b02bf..af495ad4 100644
--- a/freebsd/sys/dev/mii/mii_bitbang.c
+++ b/freebsd/sys/dev/mii/mii_bitbang.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: mii_bitbang.c,v 1.12 2008/05/04 17:06:09 xtraeme Exp $ */
diff --git a/freebsd/sys/dev/mii/mii_physubr.c b/freebsd/sys/dev/mii/mii_physubr.c
index 80996d38..7fc4135c 100644
--- a/freebsd/sys/dev/mii/mii_physubr.c
+++ b/freebsd/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */
diff --git a/freebsd/sys/dev/pci/pci.c b/freebsd/sys/dev/pci/pci.c
index 1a3b2312..8557cb33 100644
--- a/freebsd/sys/dev/pci/pci.c
+++ b/freebsd/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/dev/pci/pci_pci.c b/freebsd/sys/dev/pci/pci_pci.c
index 432ba7b9..b0951024 100644
--- a/freebsd/sys/dev/pci/pci_pci.c
+++ b/freebsd/sys/dev/pci/pci_pci.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
diff --git a/freebsd/sys/dev/pci/pci_user.c b/freebsd/sys/dev/pci/pci_user.c
index 3df4d73b..1a977860 100644
--- a/freebsd/sys/dev/pci/pci_user.c
+++ b/freebsd/sys/dev/pci/pci_user.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/dev/random/harvest.c b/freebsd/sys/dev/random/harvest.c
index 8f6efd22..f42d35d6 100644
--- a/freebsd/sys/dev/random/harvest.c
+++ b/freebsd/sys/dev/random/harvest.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000-2004 Mark R V Murray
diff --git a/freebsd/sys/dev/re/if_re.c b/freebsd/sys/dev/re/if_re.c
index a290d73c..fb86f6a8 100644
--- a/freebsd/sys/dev/re/if_re.c
+++ b/freebsd/sys/dev/re/if_re.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, 1998-2003
diff --git a/freebsd/sys/dev/smc/if_smc.c b/freebsd/sys/dev/smc/if_smc.c
index 2f4e0f1e..b6cb58fd 100644
--- a/freebsd/sys/dev/smc/if_smc.c
+++ b/freebsd/sys/dev/smc/if_smc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008 Benno Rice. All rights reserved.
diff --git a/freebsd/sys/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c
index d126e9a9..18864431 100644
--- a/freebsd/sys/dev/usb/controller/ehci.c
+++ b/freebsd/sys/dev/usb/controller/ehci.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
diff --git a/freebsd/sys/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c
index 19ecf296..94e94fd9 100644
--- a/freebsd/sys/dev/usb/controller/ohci.c
+++ b/freebsd/sys/dev/usb/controller/ohci.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
diff --git a/freebsd/sys/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c
index ce3263dd..3f9c8742 100644
--- a/freebsd/sys/dev/usb/controller/usb_controller.c
+++ b/freebsd/sys/dev/usb/controller/usb_controller.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c
index 6ae14acf..c11ef928 100644
--- a/freebsd/sys/dev/usb/quirk/usb_quirk.c
+++ b/freebsd/sys/dev/usb/quirk/usb_quirk.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c
index 9c448466..d3d2040f 100644
--- a/freebsd/sys/dev/usb/storage/umass.c
+++ b/freebsd/sys/dev/usb/storage/umass.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c
index 4aa8e1f4..80cd8c37 100644
--- a/freebsd/sys/dev/usb/usb_busdma.c
+++ b/freebsd/sys/dev/usb/usb_busdma.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c
index 27e07adf..80f5ecd4 100644
--- a/freebsd/sys/dev/usb/usb_core.c
+++ b/freebsd/sys/dev/usb/usb_core.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c
index 159bf7ea..ab949ecb 100644
--- a/freebsd/sys/dev/usb/usb_debug.c
+++ b/freebsd/sys/dev/usb/usb_debug.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c
index a22de719..68000d8e 100644
--- a/freebsd/sys/dev/usb/usb_dev.c
+++ b/freebsd/sys/dev/usb/usb_dev.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c
index a38e3d1c..3a58158d 100644
--- a/freebsd/sys/dev/usb/usb_device.c
+++ b/freebsd/sys/dev/usb/usb_device.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c
index 31e78225..32ff5e6a 100644
--- a/freebsd/sys/dev/usb/usb_dynamic.c
+++ b/freebsd/sys/dev/usb/usb_dynamic.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c
index 9f6e4569..f25f95e1 100644
--- a/freebsd/sys/dev/usb/usb_error.c
+++ b/freebsd/sys/dev/usb/usb_error.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c
index 4e439e15..361ee2ef 100644
--- a/freebsd/sys/dev/usb/usb_generic.c
+++ b/freebsd/sys/dev/usb/usb_generic.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c
index d1df80a1..296548e5 100644
--- a/freebsd/sys/dev/usb/usb_handle_request.c
+++ b/freebsd/sys/dev/usb/usb_handle_request.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c
index 0dc146df..86fa27b0 100644
--- a/freebsd/sys/dev/usb/usb_hid.c
+++ b/freebsd/sys/dev/usb/usb_hid.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $ */
diff --git a/freebsd/sys/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c
index c5887797..97b3a4dd 100644
--- a/freebsd/sys/dev/usb/usb_hub.c
+++ b/freebsd/sys/dev/usb/usb_hub.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c
index ed752fed..b9ff5938 100644
--- a/freebsd/sys/dev/usb/usb_lookup.c
+++ b/freebsd/sys/dev/usb/usb_lookup.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c
index c6ee8ee5..37fa2a15 100644
--- a/freebsd/sys/dev/usb/usb_mbuf.c
+++ b/freebsd/sys/dev/usb/usb_mbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c
index 018809d7..5e8eebb3 100644
--- a/freebsd/sys/dev/usb/usb_msctest.c
+++ b/freebsd/sys/dev/usb/usb_msctest.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c
index f2529d12..e543a901 100644
--- a/freebsd/sys/dev/usb/usb_parse.c
+++ b/freebsd/sys/dev/usb/usb_parse.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c
index 99e2d306..fb422df4 100644
--- a/freebsd/sys/dev/usb/usb_process.c
+++ b/freebsd/sys/dev/usb/usb_process.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c
index cb3b030c..2897cadb 100644
--- a/freebsd/sys/dev/usb/usb_request.c
+++ b/freebsd/sys/dev/usb/usb_request.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c
index a8b0b0ac..d3d41709 100644
--- a/freebsd/sys/dev/usb/usb_transfer.c
+++ b/freebsd/sys/dev/usb/usb_transfer.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c
index aeafa8a5..5c56da87 100644
--- a/freebsd/sys/dev/usb/usb_util.c
+++ b/freebsd/sys/dev/usb/usb_util.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/*-
diff --git a/freebsd/sys/h8300/h8300/in_cksum.c b/freebsd/sys/h8300/h8300/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/h8300/h8300/in_cksum.c
+++ b/freebsd/sys/h8300/h8300/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/h8300/h8300/legacy.c b/freebsd/sys/h8300/h8300/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/h8300/h8300/legacy.c
+++ b/freebsd/sys/h8300/h8300/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/h8300/pci/pci_bus.c b/freebsd/sys/h8300/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/h8300/pci/pci_bus.c
+++ b/freebsd/sys/h8300/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/i386/i386/in_cksum.c b/freebsd/sys/i386/i386/in_cksum.c
index 77102b14..beb5ae88 100644
--- a/freebsd/sys/i386/i386/in_cksum.c
+++ b/freebsd/sys/i386/i386/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/freebsd/sys/i386/i386/legacy.c b/freebsd/sys/i386/i386/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/i386/i386/legacy.c
+++ b/freebsd/sys/i386/i386/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/i386/pci/pci_bus.c b/freebsd/sys/i386/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/i386/pci/pci_bus.c
+++ b/freebsd/sys/i386/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/kern/init_main.c b/freebsd/sys/kern/init_main.c
index 604a7f2b..23170bb6 100644
--- a/freebsd/sys/kern/init_main.c
+++ b/freebsd/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1995 Terrence R. Lambert
diff --git a/freebsd/sys/kern/kern_event.c b/freebsd/sys/kern/kern_event.c
index 62498b25..449bc991 100644
--- a/freebsd/sys/kern/kern_event.c
+++ b/freebsd/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
diff --git a/freebsd/sys/kern/kern_hhook.c b/freebsd/sys/kern/kern_hhook.c
index 3a5503a6..f6c9e73e 100644
--- a/freebsd/sys/kern/kern_hhook.c
+++ b/freebsd/sys/kern/kern_hhook.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
diff --git a/freebsd/sys/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c
index 336866c8..a9017fd2 100644
--- a/freebsd/sys/kern/kern_intr.c
+++ b/freebsd/sys/kern/kern_intr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/kern/kern_khelp.c b/freebsd/sys/kern/kern_khelp.c
index ce8dd662..9e4127da 100644
--- a/freebsd/sys/kern/kern_khelp.c
+++ b/freebsd/sys/kern/kern_khelp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
diff --git a/freebsd/sys/kern/kern_linker.c b/freebsd/sys/kern/kern_linker.c
index 90c73a70..d6975a4a 100644
--- a/freebsd/sys/kern/kern_linker.c
+++ b/freebsd/sys/kern/kern_linker.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997-2000 Doug Rabson
diff --git a/freebsd/sys/kern/kern_mbuf.c b/freebsd/sys/kern/kern_mbuf.c
index 90212bf6..12b4841b 100644
--- a/freebsd/sys/kern/kern_mbuf.c
+++ b/freebsd/sys/kern/kern_mbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004, 2005,
diff --git a/freebsd/sys/kern/kern_mib.c b/freebsd/sys/kern/kern_mib.c
index c513463d..7a364a5e 100644
--- a/freebsd/sys/kern/kern_mib.c
+++ b/freebsd/sys/kern/kern_mib.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1989, 1993
diff --git a/freebsd/sys/kern/kern_module.c b/freebsd/sys/kern/kern_module.c
index 9ff8a78f..40e64371 100644
--- a/freebsd/sys/kern/kern_module.c
+++ b/freebsd/sys/kern/kern_module.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997 Doug Rabson
diff --git a/freebsd/sys/kern/kern_mtxpool.c b/freebsd/sys/kern/kern_mtxpool.c
index 26d9fd53..df1b1132 100644
--- a/freebsd/sys/kern/kern_mtxpool.c
+++ b/freebsd/sys/kern/kern_mtxpool.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Matthew Dillon. All Rights Reserved.
diff --git a/freebsd/sys/kern/kern_osd.c b/freebsd/sys/kern/kern_osd.c
index 167607e0..8461648b 100644
--- a/freebsd/sys/kern/kern_osd.c
+++ b/freebsd/sys/kern/kern_osd.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/freebsd/sys/kern/kern_subr.c b/freebsd/sys/kern/kern_subr.c
index 0cbc75b9..571da0b2 100644
--- a/freebsd/sys/kern/kern_subr.c
+++ b/freebsd/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1991, 1993
diff --git a/freebsd/sys/kern/kern_sysctl.c b/freebsd/sys/kern/kern_sysctl.c
index fad7ec10..2fb986bb 100644
--- a/freebsd/sys/kern/kern_sysctl.c
+++ b/freebsd/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1989, 1993
diff --git a/freebsd/sys/kern/kern_time.c b/freebsd/sys/kern/kern_time.c
index 46b47868..d15da74f 100644
--- a/freebsd/sys/kern/kern_time.c
+++ b/freebsd/sys/kern/kern_time.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1989, 1993
diff --git a/freebsd/sys/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c
index 73cbd571..c8522153 100644
--- a/freebsd/sys/kern/kern_timeout.c
+++ b/freebsd/sys/kern/kern_timeout.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1991, 1993
diff --git a/freebsd/sys/kern/subr_bufring.c b/freebsd/sys/kern/subr_bufring.c
index 6cc2ec6a..f40f0d76 100644
--- a/freebsd/sys/kern/subr_bufring.c
+++ b/freebsd/sys/kern/subr_bufring.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007, 2008 Kip Macy <kmacy@freebsd.org>
diff --git a/freebsd/sys/kern/subr_bus.c b/freebsd/sys/kern/subr_bus.c
index f58e2a73..f476951c 100644
--- a/freebsd/sys/kern/subr_bus.c
+++ b/freebsd/sys/kern/subr_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997,1998,2003 Doug Rabson
diff --git a/freebsd/sys/kern/subr_eventhandler.c b/freebsd/sys/kern/subr_eventhandler.c
index 258dc0bf..dd20f529 100644
--- a/freebsd/sys/kern/subr_eventhandler.c
+++ b/freebsd/sys/kern/subr_eventhandler.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
diff --git a/freebsd/sys/kern/subr_hints.c b/freebsd/sys/kern/subr_hints.c
index 68725bde..960ceb8a 100644
--- a/freebsd/sys/kern/subr_hints.c
+++ b/freebsd/sys/kern/subr_hints.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000,2001 Peter Wemm <peter@FreeBSD.org>
diff --git a/freebsd/sys/kern/subr_kobj.c b/freebsd/sys/kern/subr_kobj.c
index 8d182173..7f2b31f7 100644
--- a/freebsd/sys/kern/subr_kobj.c
+++ b/freebsd/sys/kern/subr_kobj.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000,2003 Doug Rabson
diff --git a/freebsd/sys/kern/subr_module.c b/freebsd/sys/kern/subr_module.c
index a6c9d1f5..592bd083 100644
--- a/freebsd/sys/kern/subr_module.c
+++ b/freebsd/sys/kern/subr_module.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1998 Michael Smith
diff --git a/freebsd/sys/kern/subr_rman.c b/freebsd/sys/kern/subr_rman.c
index a1982daf..5480201c 100644
--- a/freebsd/sys/kern/subr_rman.c
+++ b/freebsd/sys/kern/subr_rman.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/kern/subr_sbuf.c b/freebsd/sys/kern/subr_sbuf.c
index c57392d6..a92c09c1 100644
--- a/freebsd/sys/kern/subr_sbuf.c
+++ b/freebsd/sys/kern/subr_sbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000-2008 Poul-Henning Kamp
diff --git a/freebsd/sys/kern/subr_taskqueue.c b/freebsd/sys/kern/subr_taskqueue.c
index d2072082..be19c5b4 100644
--- a/freebsd/sys/kern/subr_taskqueue.c
+++ b/freebsd/sys/kern/subr_taskqueue.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000 Doug Rabson
diff --git a/freebsd/sys/kern/subr_unit.c b/freebsd/sys/kern/subr_unit.c
index 386a470b..f4d1d435 100644
--- a/freebsd/sys/kern/subr_unit.c
+++ b/freebsd/sys/kern/subr_unit.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004 Poul-Henning Kamp
diff --git a/freebsd/sys/kern/sys_generic.c b/freebsd/sys/kern/sys_generic.c
index deda7afd..ba636b39 100644
--- a/freebsd/sys/kern/sys_generic.c
+++ b/freebsd/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1989, 1993
diff --git a/freebsd/sys/kern/sys_socket.c b/freebsd/sys/kern/sys_socket.c
index e86698fa..0c1efdf0 100644
--- a/freebsd/sys/kern/sys_socket.c
+++ b/freebsd/sys/kern/sys_socket.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1990, 1993
diff --git a/freebsd/sys/kern/uipc_accf.c b/freebsd/sys/kern/uipc_accf.c
index 5fa31bc5..396e9078 100644
--- a/freebsd/sys/kern/uipc_accf.c
+++ b/freebsd/sys/kern/uipc_accf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000 Paycounter, Inc.
diff --git a/freebsd/sys/kern/uipc_domain.c b/freebsd/sys/kern/uipc_domain.c
index 7a70e246..450c1d8c 100644
--- a/freebsd/sys/kern/uipc_domain.c
+++ b/freebsd/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/kern/uipc_mbuf.c b/freebsd/sys/kern/uipc_mbuf.c
index f3b7c10d..f05546b1 100644
--- a/freebsd/sys/kern/uipc_mbuf.c
+++ b/freebsd/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1991, 1993
diff --git a/freebsd/sys/kern/uipc_mbuf2.c b/freebsd/sys/kern/uipc_mbuf2.c
index 960a4206..a2e4e395 100644
--- a/freebsd/sys/kern/uipc_mbuf2.c
+++ b/freebsd/sys/kern/uipc_mbuf2.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: uipc_mbuf2.c,v 1.31 2001/11/28 11:08:53 itojun Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */
diff --git a/freebsd/sys/kern/uipc_sockbuf.c b/freebsd/sys/kern/uipc_sockbuf.c
index 1ee7a831..b89abc84 100644
--- a/freebsd/sys/kern/uipc_sockbuf.c
+++ b/freebsd/sys/kern/uipc_sockbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993
diff --git a/freebsd/sys/kern/uipc_socket.c b/freebsd/sys/kern/uipc_socket.c
index 5b3b9eef..614b5408 100644
--- a/freebsd/sys/kern/uipc_socket.c
+++ b/freebsd/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993
diff --git a/freebsd/sys/kern/uipc_syscalls.c b/freebsd/sys/kern/uipc_syscalls.c
index 960aae87..73b91367 100644
--- a/freebsd/sys/kern/uipc_syscalls.c
+++ b/freebsd/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1989, 1990, 1993
diff --git a/freebsd/sys/libkern/arc4random.c b/freebsd/sys/libkern/arc4random.c
index 80b463f5..ab6357f7 100644
--- a/freebsd/sys/libkern/arc4random.c
+++ b/freebsd/sys/libkern/arc4random.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* THE BEER-WARE LICENSE
diff --git a/freebsd/sys/libkern/fls.c b/freebsd/sys/libkern/fls.c
index 4b780b9d..c6766815 100644
--- a/freebsd/sys/libkern/fls.c
+++ b/freebsd/sys/libkern/fls.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990, 1993
diff --git a/freebsd/sys/libkern/inet_ntoa.c b/freebsd/sys/libkern/inet_ntoa.c
index 288e71d7..1d36ab29 100644
--- a/freebsd/sys/libkern/inet_ntoa.c
+++ b/freebsd/sys/libkern/inet_ntoa.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1994, 1995 Massachusetts Institute of Technology
diff --git a/freebsd/sys/libkern/random.c b/freebsd/sys/libkern/random.c
index f5e30c34..6d6755a3 100644
--- a/freebsd/sys/libkern/random.c
+++ b/freebsd/sys/libkern/random.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1992, 1993
diff --git a/freebsd/sys/lm32/lm32/in_cksum.c b/freebsd/sys/lm32/lm32/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/lm32/lm32/in_cksum.c
+++ b/freebsd/sys/lm32/lm32/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/lm32/lm32/legacy.c b/freebsd/sys/lm32/lm32/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/lm32/lm32/legacy.c
+++ b/freebsd/sys/lm32/lm32/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/lm32/pci/pci_bus.c b/freebsd/sys/lm32/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/lm32/pci/pci_bus.c
+++ b/freebsd/sys/lm32/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/m32c/m32c/in_cksum.c b/freebsd/sys/m32c/m32c/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/m32c/m32c/in_cksum.c
+++ b/freebsd/sys/m32c/m32c/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/m32c/m32c/legacy.c b/freebsd/sys/m32c/m32c/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/m32c/m32c/legacy.c
+++ b/freebsd/sys/m32c/m32c/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/m32c/pci/pci_bus.c b/freebsd/sys/m32c/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/m32c/pci/pci_bus.c
+++ b/freebsd/sys/m32c/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/m32r/m32r/in_cksum.c b/freebsd/sys/m32r/m32r/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/m32r/m32r/in_cksum.c
+++ b/freebsd/sys/m32r/m32r/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/m32r/m32r/legacy.c b/freebsd/sys/m32r/m32r/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/m32r/m32r/legacy.c
+++ b/freebsd/sys/m32r/m32r/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/m32r/pci/pci_bus.c b/freebsd/sys/m32r/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/m32r/pci/pci_bus.c
+++ b/freebsd/sys/m32r/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/m68k/m68k/in_cksum.c b/freebsd/sys/m68k/m68k/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/m68k/m68k/in_cksum.c
+++ b/freebsd/sys/m68k/m68k/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/m68k/m68k/legacy.c b/freebsd/sys/m68k/m68k/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/m68k/m68k/legacy.c
+++ b/freebsd/sys/m68k/m68k/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/m68k/pci/pci_bus.c b/freebsd/sys/m68k/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/m68k/pci/pci_bus.c
+++ b/freebsd/sys/m68k/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/mips/mips/in_cksum.c b/freebsd/sys/mips/mips/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/mips/mips/in_cksum.c
+++ b/freebsd/sys/mips/mips/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/mips/mips/legacy.c b/freebsd/sys/mips/mips/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/mips/mips/legacy.c
+++ b/freebsd/sys/mips/mips/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/mips/pci/pci_bus.c b/freebsd/sys/mips/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/mips/pci/pci_bus.c
+++ b/freebsd/sys/mips/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/net/bpf.c b/freebsd/sys/net/bpf.c
index 179d5f0a..6b1e4b8a 100644
--- a/freebsd/sys/net/bpf.c
+++ b/freebsd/sys/net/bpf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990, 1991, 1993
diff --git a/freebsd/sys/net/bpf_buffer.c b/freebsd/sys/net/bpf_buffer.c
index 382497f6..910bcd0c 100644
--- a/freebsd/sys/net/bpf_buffer.c
+++ b/freebsd/sys/net/bpf_buffer.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007 Seccuris Inc.
diff --git a/freebsd/sys/net/bpf_filter.c b/freebsd/sys/net/bpf_filter.c
index e796cf79..3e310000 100644
--- a/freebsd/sys/net/bpf_filter.c
+++ b/freebsd/sys/net/bpf_filter.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990, 1991, 1993
diff --git a/freebsd/sys/net/bpf_jitter.c b/freebsd/sys/net/bpf_jitter.c
index 02c0b34f..cd4d7d2b 100644
--- a/freebsd/sys/net/bpf_jitter.c
+++ b/freebsd/sys/net/bpf_jitter.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
diff --git a/freebsd/sys/net/bridgestp.c b/freebsd/sys/net/bridgestp.c
index 1b2ef7cf..167bc59f 100644
--- a/freebsd/sys/net/bridgestp.c
+++ b/freebsd/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: bridgestp.c,v 1.5 2003/11/28 08:56:48 keihan Exp $ */
diff --git a/freebsd/sys/net/ieee8023ad_lacp.c b/freebsd/sys/net/ieee8023ad_lacp.c
index 1b4418a2..92e705b0 100644
--- a/freebsd/sys/net/ieee8023ad_lacp.c
+++ b/freebsd/sys/net/ieee8023ad_lacp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c
index 5dffd06d..7d7869a3 100644
--- a/freebsd/sys/net/if.c
+++ b/freebsd/sys/net/if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1980, 1986, 1993
diff --git a/freebsd/sys/net/if_arcsubr.c b/freebsd/sys/net/if_arcsubr.c
index e9422068..8ed35f77 100644
--- a/freebsd/sys/net/if_arcsubr.c
+++ b/freebsd/sys/net/if_arcsubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */
/* $FreeBSD$ */
diff --git a/freebsd/sys/net/if_atmsubr.c b/freebsd/sys/net/if_atmsubr.c
index e3ce4ea0..3d6295e6 100644
--- a/freebsd/sys/net/if_atmsubr.c
+++ b/freebsd/sys/net/if_atmsubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_atmsubr.c,v 1.10 1997/03/11 23:19:51 chuck Exp $ */
diff --git a/freebsd/sys/net/if_bridge.c b/freebsd/sys/net/if_bridge.c
index 52146381..266926a5 100644
--- a/freebsd/sys/net/if_bridge.c
+++ b/freebsd/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $ */
diff --git a/freebsd/sys/net/if_clone.c b/freebsd/sys/net/if_clone.c
index af0a9ea4..d0701845 100644
--- a/freebsd/sys/net/if_clone.c
+++ b/freebsd/sys/net/if_clone.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1980, 1986, 1993
diff --git a/freebsd/sys/net/if_dead.c b/freebsd/sys/net/if_dead.c
index c6453c37..b0231cc9 100644
--- a/freebsd/sys/net/if_dead.c
+++ b/freebsd/sys/net/if_dead.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 Robert N. M. Watson
diff --git a/freebsd/sys/net/if_disc.c b/freebsd/sys/net/if_disc.c
index 54336eb8..3d4f3159 100644
--- a/freebsd/sys/net/if_disc.c
+++ b/freebsd/sys/net/if_disc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/net/if_edsc.c b/freebsd/sys/net/if_edsc.c
index 71160354..6bb80fdb 100644
--- a/freebsd/sys/net/if_edsc.c
+++ b/freebsd/sys/net/if_edsc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/net/if_ef.c b/freebsd/sys/net/if_ef.c
index ced792c3..4aa76712 100644
--- a/freebsd/sys/net/if_ef.c
+++ b/freebsd/sys/net/if_ef.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1999, 2000 Boris Popov
diff --git a/freebsd/sys/net/if_enc.c b/freebsd/sys/net/if_enc.c
index 017d707c..fdbcb9b8 100644
--- a/freebsd/sys/net/if_enc.c
+++ b/freebsd/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2006 The FreeBSD Project.
diff --git a/freebsd/sys/net/if_epair.c b/freebsd/sys/net/if_epair.c
index fafc0259..a79a8341 100644
--- a/freebsd/sys/net/if_epair.c
+++ b/freebsd/sys/net/if_epair.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008 The FreeBSD Foundation
diff --git a/freebsd/sys/net/if_ethersubr.c b/freebsd/sys/net/if_ethersubr.c
index b7c48731..63013b63 100644
--- a/freebsd/sys/net/if_ethersubr.c
+++ b/freebsd/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1989, 1993
diff --git a/freebsd/sys/net/if_faith.c b/freebsd/sys/net/if_faith.c
index 58de362a..858774df 100644
--- a/freebsd/sys/net/if_faith.c
+++ b/freebsd/sys/net/if_faith.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: if_faith.c,v 1.23 2001/12/17 13:55:29 sumikawa Exp $ */
diff --git a/freebsd/sys/net/if_fddisubr.c b/freebsd/sys/net/if_fddisubr.c
index 154fe2fc..7a7fb471 100644
--- a/freebsd/sys/net/if_fddisubr.c
+++ b/freebsd/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1995, 1996
diff --git a/freebsd/sys/net/if_fwsubr.c b/freebsd/sys/net/if_fwsubr.c
index df90d48d..61cc7039 100644
--- a/freebsd/sys/net/if_fwsubr.c
+++ b/freebsd/sys/net/if_fwsubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004 Doug Rabson
diff --git a/freebsd/sys/net/if_gif.c b/freebsd/sys/net/if_gif.c
index 1a8e4c8d..10d1dcce 100644
--- a/freebsd/sys/net/if_gif.c
+++ b/freebsd/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */
diff --git a/freebsd/sys/net/if_gre.c b/freebsd/sys/net/if_gre.c
index 21f39eb2..24a4d876 100644
--- a/freebsd/sys/net/if_gre.c
+++ b/freebsd/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */
/* $FreeBSD$ */
diff --git a/freebsd/sys/net/if_iso88025subr.c b/freebsd/sys/net/if_iso88025subr.c
index b52853a2..d59e2b2a 100644
--- a/freebsd/sys/net/if_iso88025subr.c
+++ b/freebsd/sys/net/if_iso88025subr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1998, Larry Lile
diff --git a/freebsd/sys/net/if_lagg.c b/freebsd/sys/net/if_lagg.c
index 5d5064a4..f836f3ae 100644
--- a/freebsd/sys/net/if_lagg.c
+++ b/freebsd/sys/net/if_lagg.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: if_trunk.c,v 1.30 2007/01/31 06:20:19 reyk Exp $ */
diff --git a/freebsd/sys/net/if_llatbl.c b/freebsd/sys/net/if_llatbl.c
index 80888559..53077589 100644
--- a/freebsd/sys/net/if_llatbl.c
+++ b/freebsd/sys/net/if_llatbl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
diff --git a/freebsd/sys/net/if_loop.c b/freebsd/sys/net/if_loop.c
index 3b36ab05..958019d9 100644
--- a/freebsd/sys/net/if_loop.c
+++ b/freebsd/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/net/if_media.c b/freebsd/sys/net/if_media.c
index 3bc6122c..264d3535 100644
--- a/freebsd/sys/net/if_media.c
+++ b/freebsd/sys/net/if_media.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $ */
/* $FreeBSD$ */
diff --git a/freebsd/sys/net/if_mib.c b/freebsd/sys/net/if_mib.c
index fe9d0e23..a7d436ad 100644
--- a/freebsd/sys/net/if_mib.c
+++ b/freebsd/sys/net/if_mib.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1996 Massachusetts Institute of Technology
diff --git a/freebsd/sys/net/if_spppfr.c b/freebsd/sys/net/if_spppfr.c
index f25bad7b..93bbaeba 100644
--- a/freebsd/sys/net/if_spppfr.c
+++ b/freebsd/sys/net/if_spppfr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Synchronous Frame Relay link level subroutines.
diff --git a/freebsd/sys/net/if_spppsubr.c b/freebsd/sys/net/if_spppsubr.c
index 01743f47..5619554a 100644
--- a/freebsd/sys/net/if_spppsubr.c
+++ b/freebsd/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Synchronous PPP/Cisco/Frame Relay link level subroutines.
diff --git a/freebsd/sys/net/if_stf.c b/freebsd/sys/net/if_stf.c
index a808548c..4f0346f8 100644
--- a/freebsd/sys/net/if_stf.c
+++ b/freebsd/sys/net/if_stf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */
diff --git a/freebsd/sys/net/if_tap.c b/freebsd/sys/net/if_tap.c
index 6e6b6a64..63861b41 100644
--- a/freebsd/sys/net/if_tap.c
+++ b/freebsd/sys/net/if_tap.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
diff --git a/freebsd/sys/net/if_tun.c b/freebsd/sys/net/if_tun.c
index 444113f4..d5f22cde 100644
--- a/freebsd/sys/net/if_tun.c
+++ b/freebsd/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_tun.c,v 1.14 1994/06/29 06:36:25 cgd Exp $ */
diff --git a/freebsd/sys/net/if_vlan.c b/freebsd/sys/net/if_vlan.c
index 81c151a5..95ea1a9e 100644
--- a/freebsd/sys/net/if_vlan.c
+++ b/freebsd/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/net/netisr.c b/freebsd/sys/net/netisr.c
index 6ba71233..53d96ba9 100644
--- a/freebsd/sys/net/netisr.c
+++ b/freebsd/sys/net/netisr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Robert N. M. Watson
diff --git a/freebsd/sys/net/pfil.c b/freebsd/sys/net/pfil.c
index a11986a9..7fceea35 100644
--- a/freebsd/sys/net/pfil.c
+++ b/freebsd/sys/net/pfil.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $ */
diff --git a/freebsd/sys/net/radix.c b/freebsd/sys/net/radix.c
index e0cdea30..d31a5b3c 100644
--- a/freebsd/sys/net/radix.c
+++ b/freebsd/sys/net/radix.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1989, 1993
diff --git a/freebsd/sys/net/radix_mpath.c b/freebsd/sys/net/radix_mpath.c
index 6a3e3ef7..2af82da0 100644
--- a/freebsd/sys/net/radix_mpath.c
+++ b/freebsd/sys/net/radix_mpath.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: radix_mpath.c,v 1.17 2004/11/08 10:29:39 itojun Exp $ */
diff --git a/freebsd/sys/net/raw_cb.c b/freebsd/sys/net/raw_cb.c
index 13f4b949..68b8bd26 100644
--- a/freebsd/sys/net/raw_cb.c
+++ b/freebsd/sys/net/raw_cb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1980, 1986, 1993
diff --git a/freebsd/sys/net/raw_usrreq.c b/freebsd/sys/net/raw_usrreq.c
index 0d7973e9..1030526f 100644
--- a/freebsd/sys/net/raw_usrreq.c
+++ b/freebsd/sys/net/raw_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1980, 1986, 1993
diff --git a/freebsd/sys/net/route.c b/freebsd/sys/net/route.c
index 3821c208..36e3ae73 100644
--- a/freebsd/sys/net/route.c
+++ b/freebsd/sys/net/route.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1980, 1986, 1991, 1993
diff --git a/freebsd/sys/net/rtsock.c b/freebsd/sys/net/rtsock.c
index beca84da..c1a263d8 100644
--- a/freebsd/sys/net/rtsock.c
+++ b/freebsd/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1991, 1993
diff --git a/freebsd/sys/net/slcompress.c b/freebsd/sys/net/slcompress.c
index 876d5be3..4b5a9f97 100644
--- a/freebsd/sys/net/slcompress.c
+++ b/freebsd/sys/net/slcompress.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1989, 1993, 1994
diff --git a/freebsd/sys/net80211/ieee80211.c b/freebsd/sys/net80211/ieee80211.c
index 831998b6..3d121987 100644
--- a/freebsd/sys/net80211/ieee80211.c
+++ b/freebsd/sys/net80211/ieee80211.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_acl.c b/freebsd/sys/net80211/ieee80211_acl.c
index 2bad7bf4..0d26a4e2 100644
--- a/freebsd/sys/net80211/ieee80211_acl.c
+++ b/freebsd/sys/net80211/ieee80211_acl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_action.c b/freebsd/sys/net80211/ieee80211_action.c
index 0804b46c..1135895b 100644
--- a/freebsd/sys/net80211/ieee80211_action.c
+++ b/freebsd/sys/net80211/ieee80211_action.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_adhoc.c b/freebsd/sys/net80211/ieee80211_adhoc.c
index 3030bcd0..b7933a17 100644
--- a/freebsd/sys/net80211/ieee80211_adhoc.c
+++ b/freebsd/sys/net80211/ieee80211_adhoc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_ageq.c b/freebsd/sys/net80211/ieee80211_ageq.c
index d942196a..349345cb 100644
--- a/freebsd/sys/net80211/ieee80211_ageq.c
+++ b/freebsd/sys/net80211/ieee80211_ageq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_amrr.c b/freebsd/sys/net80211/ieee80211_amrr.c
index 74b0ab99..7b340bbe 100644
--- a/freebsd/sys/net80211/ieee80211_amrr.c
+++ b/freebsd/sys/net80211/ieee80211_amrr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: ieee80211_amrr.c,v 1.1 2006/06/17 19:07:19 damien Exp $ */
diff --git a/freebsd/sys/net80211/ieee80211_crypto.c b/freebsd/sys/net80211/ieee80211_crypto.c
index a3b3375e..bbd82274 100644
--- a/freebsd/sys/net80211/ieee80211_crypto.c
+++ b/freebsd/sys/net80211/ieee80211_crypto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c
index a4f327bc..81ce4df4 100644
--- a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c
+++ b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_crypto_none.c b/freebsd/sys/net80211/ieee80211_crypto_none.c
index 88dd7d72..c172c5ce 100644
--- a/freebsd/sys/net80211/ieee80211_crypto_none.c
+++ b/freebsd/sys/net80211/ieee80211_crypto_none.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_crypto_tkip.c b/freebsd/sys/net80211/ieee80211_crypto_tkip.c
index 01d2002e..d75baeda 100644
--- a/freebsd/sys/net80211/ieee80211_crypto_tkip.c
+++ b/freebsd/sys/net80211/ieee80211_crypto_tkip.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_crypto_wep.c b/freebsd/sys/net80211/ieee80211_crypto_wep.c
index 577237e7..5d268b28 100644
--- a/freebsd/sys/net80211/ieee80211_crypto_wep.c
+++ b/freebsd/sys/net80211/ieee80211_crypto_wep.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_ddb.c b/freebsd/sys/net80211/ieee80211_ddb.c
index 73778c29..25b10a6e 100644
--- a/freebsd/sys/net80211/ieee80211_ddb.c
+++ b/freebsd/sys/net80211/ieee80211_ddb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_dfs.c b/freebsd/sys/net80211/ieee80211_dfs.c
index 3090a78c..948a4dc5 100644
--- a/freebsd/sys/net80211/ieee80211_dfs.c
+++ b/freebsd/sys/net80211/ieee80211_dfs.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_freebsd.c b/freebsd/sys/net80211/ieee80211_freebsd.c
index e80a8fbb..7cfa4a81 100644
--- a/freebsd/sys/net80211/ieee80211_freebsd.c
+++ b/freebsd/sys/net80211/ieee80211_freebsd.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2003-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_hostap.c b/freebsd/sys/net80211/ieee80211_hostap.c
index 803a6f4a..12970428 100644
--- a/freebsd/sys/net80211/ieee80211_hostap.c
+++ b/freebsd/sys/net80211/ieee80211_hostap.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_ht.c b/freebsd/sys/net80211/ieee80211_ht.c
index 8f698f98..da1bb26b 100644
--- a/freebsd/sys/net80211/ieee80211_ht.c
+++ b/freebsd/sys/net80211/ieee80211_ht.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_hwmp.c b/freebsd/sys/net80211/ieee80211_hwmp.c
index ecf2879a..12a15637 100644
--- a/freebsd/sys/net80211/ieee80211_hwmp.c
+++ b/freebsd/sys/net80211/ieee80211_hwmp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 The FreeBSD Foundation
diff --git a/freebsd/sys/net80211/ieee80211_input.c b/freebsd/sys/net80211/ieee80211_input.c
index a5ee1094..97b5c756 100644
--- a/freebsd/sys/net80211/ieee80211_input.c
+++ b/freebsd/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_ioctl.c b/freebsd/sys/net80211/ieee80211_ioctl.c
index 995c82f2..af27ef10 100644
--- a/freebsd/sys/net80211/ieee80211_ioctl.c
+++ b/freebsd/sys/net80211/ieee80211_ioctl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_mesh.c b/freebsd/sys/net80211/ieee80211_mesh.c
index 8997ae8b..cd2ddb94 100644
--- a/freebsd/sys/net80211/ieee80211_mesh.c
+++ b/freebsd/sys/net80211/ieee80211_mesh.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 The FreeBSD Foundation
diff --git a/freebsd/sys/net80211/ieee80211_monitor.c b/freebsd/sys/net80211/ieee80211_monitor.c
index 70b95a02..c30d0e27 100644
--- a/freebsd/sys/net80211/ieee80211_monitor.c
+++ b/freebsd/sys/net80211/ieee80211_monitor.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_node.c b/freebsd/sys/net80211/ieee80211_node.c
index 95993d88..e1166707 100644
--- a/freebsd/sys/net80211/ieee80211_node.c
+++ b/freebsd/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_output.c b/freebsd/sys/net80211/ieee80211_output.c
index 1c902471..81aa7fb6 100644
--- a/freebsd/sys/net80211/ieee80211_output.c
+++ b/freebsd/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_phy.c b/freebsd/sys/net80211/ieee80211_phy.c
index 9d37a967..b4f70a96 100644
--- a/freebsd/sys/net80211/ieee80211_phy.c
+++ b/freebsd/sys/net80211/ieee80211_phy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_power.c b/freebsd/sys/net80211/ieee80211_power.c
index c15080c4..b39e7156 100644
--- a/freebsd/sys/net80211/ieee80211_power.c
+++ b/freebsd/sys/net80211/ieee80211_power.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_proto.c b/freebsd/sys/net80211/ieee80211_proto.c
index d2874951..a0a6a0fa 100644
--- a/freebsd/sys/net80211/ieee80211_proto.c
+++ b/freebsd/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Atsushi Onoe
diff --git a/freebsd/sys/net80211/ieee80211_radiotap.c b/freebsd/sys/net80211/ieee80211_radiotap.c
index b51974b3..7bdb5d74 100644
--- a/freebsd/sys/net80211/ieee80211_radiotap.c
+++ b/freebsd/sys/net80211/ieee80211_radiotap.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_ratectl.c b/freebsd/sys/net80211/ieee80211_ratectl.c
index b54188e0..650371a5 100644
--- a/freebsd/sys/net80211/ieee80211_ratectl.c
+++ b/freebsd/sys/net80211/ieee80211_ratectl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
diff --git a/freebsd/sys/net80211/ieee80211_ratectl_none.c b/freebsd/sys/net80211/ieee80211_ratectl_none.c
index 62b7c99c..7d6743dd 100644
--- a/freebsd/sys/net80211/ieee80211_ratectl_none.c
+++ b/freebsd/sys/net80211/ieee80211_ratectl_none.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Bernhard Schmidt <bschmidt@FreeBSD.org>
diff --git a/freebsd/sys/net80211/ieee80211_regdomain.c b/freebsd/sys/net80211/ieee80211_regdomain.c
index 890ddf79..a6696d95 100644
--- a/freebsd/sys/net80211/ieee80211_regdomain.c
+++ b/freebsd/sys/net80211/ieee80211_regdomain.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_rssadapt.c b/freebsd/sys/net80211/ieee80211_rssadapt.c
index 687ea41e..cc3af217 100644
--- a/freebsd/sys/net80211/ieee80211_rssadapt.c
+++ b/freebsd/sys/net80211/ieee80211_rssadapt.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */
diff --git a/freebsd/sys/net80211/ieee80211_scan.c b/freebsd/sys/net80211/ieee80211_scan.c
index 4a23066d..16eeae7d 100644
--- a/freebsd/sys/net80211/ieee80211_scan.c
+++ b/freebsd/sys/net80211/ieee80211_scan.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_scan_sta.c b/freebsd/sys/net80211/ieee80211_scan_sta.c
index 573f994f..eb5bcd7c 100644
--- a/freebsd/sys/net80211/ieee80211_scan_sta.c
+++ b/freebsd/sys/net80211/ieee80211_scan_sta.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_sta.c b/freebsd/sys/net80211/ieee80211_sta.c
index d07e83c4..f709d51e 100644
--- a/freebsd/sys/net80211/ieee80211_sta.c
+++ b/freebsd/sys/net80211/ieee80211_sta.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_superg.c b/freebsd/sys/net80211/ieee80211_superg.c
index 3fcfcd74..6323fb26 100644
--- a/freebsd/sys/net80211/ieee80211_superg.c
+++ b/freebsd/sys/net80211/ieee80211_superg.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_tdma.c b/freebsd/sys/net80211/ieee80211_tdma.c
index 1a6b3298..98fdd5e4 100644
--- a/freebsd/sys/net80211/ieee80211_tdma.c
+++ b/freebsd/sys/net80211/ieee80211_tdma.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_wds.c b/freebsd/sys/net80211/ieee80211_wds.c
index 772f305c..55c2833b 100644
--- a/freebsd/sys/net80211/ieee80211_wds.c
+++ b/freebsd/sys/net80211/ieee80211_wds.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/net80211/ieee80211_xauth.c b/freebsd/sys/net80211/ieee80211_xauth.c
index 7c937906..6640fcff 100644
--- a/freebsd/sys/net80211/ieee80211_xauth.c
+++ b/freebsd/sys/net80211/ieee80211_xauth.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004 Video54 Technologies, Inc.
diff --git a/freebsd/sys/netatalk/aarp.c b/freebsd/sys/netatalk/aarp.c
index 0d469f1d..4ce3701a 100644
--- a/freebsd/sys/netatalk/aarp.c
+++ b/freebsd/sys/netatalk/aarp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
diff --git a/freebsd/sys/netatalk/at_control.c b/freebsd/sys/netatalk/at_control.c
index 5b31b47a..8dfca86a 100644
--- a/freebsd/sys/netatalk/at_control.c
+++ b/freebsd/sys/netatalk/at_control.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
diff --git a/freebsd/sys/netatalk/at_proto.c b/freebsd/sys/netatalk/at_proto.c
index 53f04236..c1d7c4ca 100644
--- a/freebsd/sys/netatalk/at_proto.c
+++ b/freebsd/sys/netatalk/at_proto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
diff --git a/freebsd/sys/netatalk/at_rmx.c b/freebsd/sys/netatalk/at_rmx.c
index 61777a70..b06a6aea 100644
--- a/freebsd/sys/netatalk/at_rmx.c
+++ b/freebsd/sys/netatalk/at_rmx.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1994, 1995 Massachusetts Institute of Technology
diff --git a/freebsd/sys/netatalk/ddp_input.c b/freebsd/sys/netatalk/ddp_input.c
index 267538ec..e477cb8d 100644
--- a/freebsd/sys/netatalk/ddp_input.c
+++ b/freebsd/sys/netatalk/ddp_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
diff --git a/freebsd/sys/netatalk/ddp_output.c b/freebsd/sys/netatalk/ddp_output.c
index 9f171fd8..94eedfea 100644
--- a/freebsd/sys/netatalk/ddp_output.c
+++ b/freebsd/sys/netatalk/ddp_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
diff --git a/freebsd/sys/netatalk/ddp_pcb.c b/freebsd/sys/netatalk/ddp_pcb.c
index 3998cbfa..223cc8a7 100644
--- a/freebsd/sys/netatalk/ddp_pcb.c
+++ b/freebsd/sys/netatalk/ddp_pcb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
diff --git a/freebsd/sys/netatalk/ddp_usrreq.c b/freebsd/sys/netatalk/ddp_usrreq.c
index e8557552..bd9f21f3 100644
--- a/freebsd/sys/netatalk/ddp_usrreq.c
+++ b/freebsd/sys/netatalk/ddp_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
diff --git a/freebsd/sys/netinet/accf_data.c b/freebsd/sys/netinet/accf_data.c
index 7b81cda6..4d4037f0 100644
--- a/freebsd/sys/netinet/accf_data.c
+++ b/freebsd/sys/netinet/accf_data.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000 Alfred Perlstein <alfred@FreeBSD.org>
diff --git a/freebsd/sys/netinet/accf_dns.c b/freebsd/sys/netinet/accf_dns.c
index abba9d8b..9858db4e 100644
--- a/freebsd/sys/netinet/accf_dns.c
+++ b/freebsd/sys/netinet/accf_dns.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (C) 2007 David Malone <dwmalone@FreeBSD.org>
diff --git a/freebsd/sys/netinet/accf_http.c b/freebsd/sys/netinet/accf_http.c
index 4397b439..97344a2c 100644
--- a/freebsd/sys/netinet/accf_http.c
+++ b/freebsd/sys/netinet/accf_http.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2000 Paycounter, Inc.
diff --git a/freebsd/sys/netinet/cc/cc.c b/freebsd/sys/netinet/cc/cc.c
index a5a971e6..8aea8dd2 100644
--- a/freebsd/sys/netinet/cc/cc.c
+++ b/freebsd/sys/netinet/cc/cc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2008
diff --git a/freebsd/sys/netinet/cc/cc_newreno.c b/freebsd/sys/netinet/cc/cc_newreno.c
index e40f6d83..c0f0cfc5 100644
--- a/freebsd/sys/netinet/cc/cc_newreno.c
+++ b/freebsd/sys/netinet/cc/cc_newreno.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
diff --git a/freebsd/sys/netinet/if_atm.c b/freebsd/sys/netinet/if_atm.c
index 97b2525c..e26d0c7c 100644
--- a/freebsd/sys/netinet/if_atm.c
+++ b/freebsd/sys/netinet/if_atm.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: if_atm.c,v 1.6 1996/10/13 02:03:01 christos Exp $ */
diff --git a/freebsd/sys/netinet/if_ether.c b/freebsd/sys/netinet/if_ether.c
index 4cd4f8e4..6b98161f 100644
--- a/freebsd/sys/netinet/if_ether.c
+++ b/freebsd/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/igmp.c b/freebsd/sys/netinet/igmp.c
index 138a1504..f2949c14 100644
--- a/freebsd/sys/netinet/igmp.c
+++ b/freebsd/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Bruce Simpson.
diff --git a/freebsd/sys/netinet/in.c b/freebsd/sys/netinet/in.c
index 9d84e82b..310800cd 100644
--- a/freebsd/sys/netinet/in.c
+++ b/freebsd/sys/netinet/in.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1991, 1993
diff --git a/freebsd/sys/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c
index 12faa528..5461334b 100644
--- a/freebsd/sys/netinet/in_gif.c
+++ b/freebsd/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */
diff --git a/freebsd/sys/netinet/in_mcast.c b/freebsd/sys/netinet/in_mcast.c
index b5fd6572..e4b31968 100644
--- a/freebsd/sys/netinet/in_mcast.c
+++ b/freebsd/sys/netinet/in_mcast.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007-2009 Bruce Simpson.
diff --git a/freebsd/sys/netinet/in_pcb.c b/freebsd/sys/netinet/in_pcb.c
index c8c1c3b0..c6f4c6f7 100644
--- a/freebsd/sys/netinet/in_pcb.c
+++ b/freebsd/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1995
diff --git a/freebsd/sys/netinet/in_proto.c b/freebsd/sys/netinet/in_proto.c
index 8b184cb9..b479e09e 100644
--- a/freebsd/sys/netinet/in_proto.c
+++ b/freebsd/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/netinet/in_rmx.c b/freebsd/sys/netinet/in_rmx.c
index 447605ec..939193f6 100644
--- a/freebsd/sys/netinet/in_rmx.c
+++ b/freebsd/sys/netinet/in_rmx.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1994, 1995 Massachusetts Institute of Technology
diff --git a/freebsd/sys/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c
index 3cfcf707..aaed21de 100644
--- a/freebsd/sys/netinet/ip_carp.c
+++ b/freebsd/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
diff --git a/freebsd/sys/netinet/ip_divert.c b/freebsd/sys/netinet/ip_divert.c
index d630dd12..5fb32ba6 100644
--- a/freebsd/sys/netinet/ip_divert.c
+++ b/freebsd/sys/netinet/ip_divert.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/ip_ecn.c b/freebsd/sys/netinet/ip_ecn.c
index 33f07b8a..cee961bf 100644
--- a/freebsd/sys/netinet/ip_ecn.c
+++ b/freebsd/sys/netinet/ip_ecn.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $ */
diff --git a/freebsd/sys/netinet/ip_encap.c b/freebsd/sys/netinet/ip_encap.c
index 9c7b904d..14f8cd51 100644
--- a/freebsd/sys/netinet/ip_encap.c
+++ b/freebsd/sys/netinet/ip_encap.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */
diff --git a/freebsd/sys/netinet/ip_fastfwd.c b/freebsd/sys/netinet/ip_fastfwd.c
index f27a4f7d..43f10ef9 100644
--- a/freebsd/sys/netinet/ip_fastfwd.c
+++ b/freebsd/sys/netinet/ip_fastfwd.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2003 Andre Oppermann, Internet Business Solutions AG
diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c
index 1838fbd1..0fc1770f 100644
--- a/freebsd/sys/netinet/ip_gre.c
+++ b/freebsd/sys/netinet/ip_gre.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
diff --git a/freebsd/sys/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c
index 1b6ec7d9..728e57ec 100644
--- a/freebsd/sys/netinet/ip_icmp.c
+++ b/freebsd/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c
index 21bb84cc..fd343101 100644
--- a/freebsd/sys/netinet/ip_id.c
+++ b/freebsd/sys/netinet/ip_id.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
diff --git a/freebsd/sys/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c
index 9d174b3b..b1154c79 100644
--- a/freebsd/sys/netinet/ip_input.c
+++ b/freebsd/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/ip_ipsec.c b/freebsd/sys/netinet/ip_ipsec.c
index 917c2c79..35ea9cd5 100644
--- a/freebsd/sys/netinet/ip_ipsec.c
+++ b/freebsd/sys/netinet/ip_ipsec.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c
index 1e9cd57a..f35aa002 100644
--- a/freebsd/sys/netinet/ip_mroute.c
+++ b/freebsd/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1989 Stephen Deering
diff --git a/freebsd/sys/netinet/ip_options.c b/freebsd/sys/netinet/ip_options.c
index 8012fd3f..7b190bfd 100644
--- a/freebsd/sys/netinet/ip_options.c
+++ b/freebsd/sys/netinet/ip_options.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/ip_output.c b/freebsd/sys/netinet/ip_output.c
index 7aedcb50..02dc7bdb 100644
--- a/freebsd/sys/netinet/ip_output.c
+++ b/freebsd/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993
diff --git a/freebsd/sys/netinet/ipfw/dn_heap.c b/freebsd/sys/netinet/ipfw/dn_heap.c
index 3af37a86..5382de45 100644
--- a/freebsd/sys/netinet/ipfw/dn_heap.c
+++ b/freebsd/sys/netinet/ipfw/dn_heap.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/dn_sched_fifo.c b/freebsd/sys/netinet/ipfw/dn_sched_fifo.c
index 3bd5e127..19e086d5 100644
--- a/freebsd/sys/netinet/ipfw/dn_sched_fifo.c
+++ b/freebsd/sys/netinet/ipfw/dn_sched_fifo.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/dn_sched_prio.c b/freebsd/sys/netinet/ipfw/dn_sched_prio.c
index b3cb689c..9549bcd6 100644
--- a/freebsd/sys/netinet/ipfw/dn_sched_prio.c
+++ b/freebsd/sys/netinet/ipfw/dn_sched_prio.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/dn_sched_qfq.c b/freebsd/sys/netinet/ipfw/dn_sched_qfq.c
index c8fc4886..cdf130fc 100644
--- a/freebsd/sys/netinet/ipfw/dn_sched_qfq.c
+++ b/freebsd/sys/netinet/ipfw/dn_sched_qfq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2010 Fabio Checconi, Luigi Rizzo, Paolo Valente
diff --git a/freebsd/sys/netinet/ipfw/dn_sched_rr.c b/freebsd/sys/netinet/ipfw/dn_sched_rr.c
index ccfd855c..f37af023 100644
--- a/freebsd/sys/netinet/ipfw/dn_sched_rr.c
+++ b/freebsd/sys/netinet/ipfw/dn_sched_rr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/dn_sched_wf2q.c b/freebsd/sys/netinet/ipfw/dn_sched_wf2q.c
index 330f78e2..5924cf59 100644
--- a/freebsd/sys/netinet/ipfw/dn_sched_wf2q.c
+++ b/freebsd/sys/netinet/ipfw/dn_sched_wf2q.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_dn_glue.c b/freebsd/sys/netinet/ipfw/ip_dn_glue.c
index 2b109771..c66f71a8 100644
--- a/freebsd/sys/netinet/ipfw/ip_dn_glue.c
+++ b/freebsd/sys/netinet/ipfw/ip_dn_glue.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_dn_io.c b/freebsd/sys/netinet/ipfw/ip_dn_io.c
index ccb91c2e..7cbbb338 100644
--- a/freebsd/sys/netinet/ipfw/ip_dn_io.c
+++ b/freebsd/sys/netinet/ipfw/ip_dn_io.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2010 Luigi Rizzo, Riccardo Panicucci, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_dummynet.c b/freebsd/sys/netinet/ipfw/ip_dummynet.c
index 89e5f4db..ae657c6c 100644
--- a/freebsd/sys/netinet/ipfw/ip_dummynet.c
+++ b/freebsd/sys/netinet/ipfw/ip_dummynet.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_fw2.c b/freebsd/sys/netinet/ipfw/ip_fw2.c
index 44781127..92a85543 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw2.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw2.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_fw_log.c b/freebsd/sys/netinet/ipfw/ip_fw_log.c
index 773c698e..18bd0e43 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw_log.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw_log.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_fw_nat.c b/freebsd/sys/netinet/ipfw/ip_fw_nat.c
index 294b185e..48c6fed0 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw_nat.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw_nat.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008 Paolo Pisati
diff --git a/freebsd/sys/netinet/ipfw/ip_fw_pfil.c b/freebsd/sys/netinet/ipfw/ip_fw_pfil.c
index ebd10c5b..897de680 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw_pfil.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw_pfil.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004 Andre Oppermann, Internet Business Solutions AG
diff --git a/freebsd/sys/netinet/ipfw/ip_fw_sockopt.c b/freebsd/sys/netinet/ipfw/ip_fw_sockopt.c
index abfc24a0..c3d7c947 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw_sockopt.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw_sockopt.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
diff --git a/freebsd/sys/netinet/ipfw/ip_fw_table.c b/freebsd/sys/netinet/ipfw/ip_fw_table.c
index 1725b8a5..58923b77 100644
--- a/freebsd/sys/netinet/ipfw/ip_fw_table.c
+++ b/freebsd/sys/netinet/ipfw/ip_fw_table.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2004 Ruslan Ermilov and Vsevolod Lobko.
diff --git a/freebsd/sys/netinet/libalias/alias.c b/freebsd/sys/netinet/libalias/alias.c
index 9a8d29bd..9dee1e93 100644
--- a/freebsd/sys/netinet/libalias/alias.c
+++ b/freebsd/sys/netinet/libalias/alias.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c
index 0e04c3f4..a27e937f 100644
--- a/freebsd/sys/netinet/libalias/alias_cuseeme.c
+++ b/freebsd/sys/netinet/libalias/alias_cuseeme.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c
index 60a8e06f..3eb31b63 100644
--- a/freebsd/sys/netinet/libalias/alias_db.c
+++ b/freebsd/sys/netinet/libalias/alias_db.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c
index d544e6e3..6298ecca 100644
--- a/freebsd/sys/netinet/libalias/alias_dummy.c
+++ b/freebsd/sys/netinet/libalias/alias_dummy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2005 Paolo Pisati <piso@FreeBSD.org>
diff --git a/freebsd/sys/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c
index 43411d41..d449bcfc 100644
--- a/freebsd/sys/netinet/libalias/alias_ftp.c
+++ b/freebsd/sys/netinet/libalias/alias_ftp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c
index 084301be..353d3332 100644
--- a/freebsd/sys/netinet/libalias/alias_irc.c
+++ b/freebsd/sys/netinet/libalias/alias_irc.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c
index cb567473..daf55b82 100644
--- a/freebsd/sys/netinet/libalias/alias_mod.c
+++ b/freebsd/sys/netinet/libalias/alias_mod.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2005 Paolo Pisati <piso@FreeBSD.org>
diff --git a/freebsd/sys/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c
index f4ae9af7..1add2fa3 100644
--- a/freebsd/sys/netinet/libalias/alias_nbt.c
+++ b/freebsd/sys/netinet/libalias/alias_nbt.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Written by Atsushi Murai <amurai@spec.co.jp>
diff --git a/freebsd/sys/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c
index 61f89392..59c7af82 100644
--- a/freebsd/sys/netinet/libalias/alias_pptp.c
+++ b/freebsd/sys/netinet/libalias/alias_pptp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* alias_pptp.c
diff --git a/freebsd/sys/netinet/libalias/alias_proxy.c b/freebsd/sys/netinet/libalias/alias_proxy.c
index 89eb2324..ec0a158c 100644
--- a/freebsd/sys/netinet/libalias/alias_proxy.c
+++ b/freebsd/sys/netinet/libalias/alias_proxy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/libalias/alias_sctp.c b/freebsd/sys/netinet/libalias/alias_sctp.c
index ac871fc9..ed0279b3 100644
--- a/freebsd/sys/netinet/libalias/alias_sctp.c
+++ b/freebsd/sys/netinet/libalias/alias_sctp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2008
diff --git a/freebsd/sys/netinet/libalias/alias_skinny.c b/freebsd/sys/netinet/libalias/alias_skinny.c
index d472d307..47bc46c2 100644
--- a/freebsd/sys/netinet/libalias/alias_skinny.c
+++ b/freebsd/sys/netinet/libalias/alias_skinny.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* alias_skinny.c
diff --git a/freebsd/sys/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c
index eed1c49f..9232568a 100644
--- a/freebsd/sys/netinet/libalias/alias_smedia.c
+++ b/freebsd/sys/netinet/libalias/alias_smedia.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* alias_smedia.c
diff --git a/freebsd/sys/netinet/libalias/alias_util.c b/freebsd/sys/netinet/libalias/alias_util.c
index 066146c8..3f8b8ac3 100644
--- a/freebsd/sys/netinet/libalias/alias_util.c
+++ b/freebsd/sys/netinet/libalias/alias_util.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
diff --git a/freebsd/sys/netinet/raw_ip.c b/freebsd/sys/netinet/raw_ip.c
index d70d8323..aa6abae9 100644
--- a/freebsd/sys/netinet/raw_ip.c
+++ b/freebsd/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/sctp_asconf.c b/freebsd/sys/netinet/sctp_asconf.c
index 3e51ed72..71fa307c 100644
--- a/freebsd/sys/netinet/sctp_asconf.c
+++ b/freebsd/sys/netinet/sctp_asconf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_auth.c b/freebsd/sys/netinet/sctp_auth.c
index 088ec8c2..ddb12560 100644
--- a/freebsd/sys/netinet/sctp_auth.c
+++ b/freebsd/sys/netinet/sctp_auth.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_bsd_addr.c b/freebsd/sys/netinet/sctp_bsd_addr.c
index 49549d15..4653b251 100644
--- a/freebsd/sys/netinet/sctp_bsd_addr.c
+++ b/freebsd/sys/netinet/sctp_bsd_addr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_cc_functions.c b/freebsd/sys/netinet/sctp_cc_functions.c
index 36818feb..9758e011 100644
--- a/freebsd/sys/netinet/sctp_cc_functions.c
+++ b/freebsd/sys/netinet/sctp_cc_functions.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_crc32.c b/freebsd/sys/netinet/sctp_crc32.c
index bf6da201..bb081e8f 100644
--- a/freebsd/sys/netinet/sctp_crc32.c
+++ b/freebsd/sys/netinet/sctp_crc32.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_indata.c b/freebsd/sys/netinet/sctp_indata.c
index c82e570f..273ad6bc 100644
--- a/freebsd/sys/netinet/sctp_indata.c
+++ b/freebsd/sys/netinet/sctp_indata.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_input.c b/freebsd/sys/netinet/sctp_input.c
index 817a95f7..645c807e 100644
--- a/freebsd/sys/netinet/sctp_input.c
+++ b/freebsd/sys/netinet/sctp_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_output.c b/freebsd/sys/netinet/sctp_output.c
index 30c6f3c0..c2c7b147 100644
--- a/freebsd/sys/netinet/sctp_output.c
+++ b/freebsd/sys/netinet/sctp_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_pcb.c b/freebsd/sys/netinet/sctp_pcb.c
index 8a0cdb42..68eca553 100644
--- a/freebsd/sys/netinet/sctp_pcb.c
+++ b/freebsd/sys/netinet/sctp_pcb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_peeloff.c b/freebsd/sys/netinet/sctp_peeloff.c
index 13b55be4..e8bb0444 100644
--- a/freebsd/sys/netinet/sctp_peeloff.c
+++ b/freebsd/sys/netinet/sctp_peeloff.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_sysctl.c b/freebsd/sys/netinet/sctp_sysctl.c
index b4ed49d4..ca462b7a 100644
--- a/freebsd/sys/netinet/sctp_sysctl.c
+++ b/freebsd/sys/netinet/sctp_sysctl.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_timer.c b/freebsd/sys/netinet/sctp_timer.c
index 950d3f71..be601113 100644
--- a/freebsd/sys/netinet/sctp_timer.c
+++ b/freebsd/sys/netinet/sctp_timer.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctp_usrreq.c b/freebsd/sys/netinet/sctp_usrreq.c
index 548ba9f3..527790ce 100644
--- a/freebsd/sys/netinet/sctp_usrreq.c
+++ b/freebsd/sys/netinet/sctp_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/sctputil.c b/freebsd/sys/netinet/sctputil.c
index 60888bef..3a88b894 100644
--- a/freebsd/sys/netinet/sctputil.c
+++ b/freebsd/sys/netinet/sctputil.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet/tcp_debug.c b/freebsd/sys/netinet/tcp_debug.c
index 5d4b992a..2ef9ce43 100644
--- a/freebsd/sys/netinet/tcp_debug.c
+++ b/freebsd/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1993
diff --git a/freebsd/sys/netinet/tcp_hostcache.c b/freebsd/sys/netinet/tcp_hostcache.c
index 69cb1a74..a0d38ff7 100644
--- a/freebsd/sys/netinet/tcp_hostcache.c
+++ b/freebsd/sys/netinet/tcp_hostcache.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
diff --git a/freebsd/sys/netinet/tcp_input.c b/freebsd/sys/netinet/tcp_input.c
index 508f6bf2..02840c89 100644
--- a/freebsd/sys/netinet/tcp_input.c
+++ b/freebsd/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
diff --git a/freebsd/sys/netinet/tcp_lro.c b/freebsd/sys/netinet/tcp_lro.c
index f8f678e3..9f1d13c3 100644
--- a/freebsd/sys/netinet/tcp_lro.c
+++ b/freebsd/sys/netinet/tcp_lro.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007, Myricom Inc.
diff --git a/freebsd/sys/netinet/tcp_offload.c b/freebsd/sys/netinet/tcp_offload.c
index 3c663a47..93b7d8de 100644
--- a/freebsd/sys/netinet/tcp_offload.c
+++ b/freebsd/sys/netinet/tcp_offload.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2007, Chelsio Inc.
diff --git a/freebsd/sys/netinet/tcp_output.c b/freebsd/sys/netinet/tcp_output.c
index 8d6881d1..c73fe099 100644
--- a/freebsd/sys/netinet/tcp_output.c
+++ b/freebsd/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/netinet/tcp_reass.c b/freebsd/sys/netinet/tcp_reass.c
index 432b6ba1..6b2605ce 100644
--- a/freebsd/sys/netinet/tcp_reass.c
+++ b/freebsd/sys/netinet/tcp_reass.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
diff --git a/freebsd/sys/netinet/tcp_sack.c b/freebsd/sys/netinet/tcp_sack.c
index fc93be91..449b538f 100644
--- a/freebsd/sys/netinet/tcp_sack.c
+++ b/freebsd/sys/netinet/tcp_sack.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
diff --git a/freebsd/sys/netinet/tcp_subr.c b/freebsd/sys/netinet/tcp_subr.c
index a42f2fa5..e23a0997 100644
--- a/freebsd/sys/netinet/tcp_subr.c
+++ b/freebsd/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/netinet/tcp_syncache.c b/freebsd/sys/netinet/tcp_syncache.c
index 46b8414c..80da0349 100644
--- a/freebsd/sys/netinet/tcp_syncache.c
+++ b/freebsd/sys/netinet/tcp_syncache.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001 McAfee, Inc.
diff --git a/freebsd/sys/netinet/tcp_timer.c b/freebsd/sys/netinet/tcp_timer.c
index 4fe0645a..77cc1feb 100644
--- a/freebsd/sys/netinet/tcp_timer.c
+++ b/freebsd/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/netinet/tcp_timewait.c b/freebsd/sys/netinet/tcp_timewait.c
index 73f3cfc9..f9b613a7 100644
--- a/freebsd/sys/netinet/tcp_timewait.c
+++ b/freebsd/sys/netinet/tcp_timewait.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/netinet/tcp_usrreq.c b/freebsd/sys/netinet/tcp_usrreq.c
index 4b0e08e9..2c1cd615 100644
--- a/freebsd/sys/netinet/tcp_usrreq.c
+++ b/freebsd/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet/udp_usrreq.c b/freebsd/sys/netinet/udp_usrreq.c
index 87cb13fc..6c0e61c1 100644
--- a/freebsd/sys/netinet/udp_usrreq.c
+++ b/freebsd/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
diff --git a/freebsd/sys/netinet6/dest6.c b/freebsd/sys/netinet6/dest6.c
index aacfdec5..cb7bb73b 100644
--- a/freebsd/sys/netinet6/dest6.c
+++ b/freebsd/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/frag6.c b/freebsd/sys/netinet6/frag6.c
index f176ffb6..3a58a48e 100644
--- a/freebsd/sys/netinet6/frag6.c
+++ b/freebsd/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/icmp6.c b/freebsd/sys/netinet6/icmp6.c
index f73dee04..8c6bc0c5 100644
--- a/freebsd/sys/netinet6/icmp6.c
+++ b/freebsd/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6.c b/freebsd/sys/netinet6/in6.c
index a57f3975..1eed3901 100644
--- a/freebsd/sys/netinet6/in6.c
+++ b/freebsd/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_cksum.c b/freebsd/sys/netinet6/in6_cksum.c
index fb8e044d..e0e03f45 100644
--- a/freebsd/sys/netinet6/in6_cksum.c
+++ b/freebsd/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_gif.c b/freebsd/sys/netinet6/in6_gif.c
index 488a0106..bab07c38 100644
--- a/freebsd/sys/netinet6/in6_gif.c
+++ b/freebsd/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_ifattach.c b/freebsd/sys/netinet6/in6_ifattach.c
index bb150eb1..57a7efef 100644
--- a/freebsd/sys/netinet6/in6_ifattach.c
+++ b/freebsd/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_mcast.c b/freebsd/sys/netinet6/in6_mcast.c
index 86162cf8..67c85c37 100644
--- a/freebsd/sys/netinet6/in6_mcast.c
+++ b/freebsd/sys/netinet6/in6_mcast.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* Copyright (c) 2009 Bruce Simpson.
diff --git a/freebsd/sys/netinet6/in6_pcb.c b/freebsd/sys/netinet6/in6_pcb.c
index 44783f3c..63ae7a65 100644
--- a/freebsd/sys/netinet6/in6_pcb.c
+++ b/freebsd/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_proto.c b/freebsd/sys/netinet6/in6_proto.c
index 1139c7d9..df05febf 100644
--- a/freebsd/sys/netinet6/in6_proto.c
+++ b/freebsd/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_rmx.c b/freebsd/sys/netinet6/in6_rmx.c
index a4bdb3af..4c59a1ad 100644
--- a/freebsd/sys/netinet6/in6_rmx.c
+++ b/freebsd/sys/netinet6/in6_rmx.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/in6_src.c b/freebsd/sys/netinet6/in6_src.c
index 4f20ee54..74577cbd 100644
--- a/freebsd/sys/netinet6/in6_src.c
+++ b/freebsd/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/ip6_forward.c b/freebsd/sys/netinet6/ip6_forward.c
index a3d3d8f4..fa5d373f 100644
--- a/freebsd/sys/netinet6/ip6_forward.c
+++ b/freebsd/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/ip6_id.c b/freebsd/sys/netinet6/ip6_id.c
index d504cb2d..33744d2e 100644
--- a/freebsd/sys/netinet6/ip6_id.c
+++ b/freebsd/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 2003 WIDE Project.
diff --git a/freebsd/sys/netinet6/ip6_input.c b/freebsd/sys/netinet6/ip6_input.c
index 47d9e690..ee537a52 100644
--- a/freebsd/sys/netinet6/ip6_input.c
+++ b/freebsd/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/ip6_ipsec.c b/freebsd/sys/netinet6/ip6_ipsec.c
index 8ed4eec2..d0b075da 100644
--- a/freebsd/sys/netinet6/ip6_ipsec.c
+++ b/freebsd/sys/netinet6/ip6_ipsec.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1982, 1986, 1988, 1993
diff --git a/freebsd/sys/netinet6/ip6_mroute.c b/freebsd/sys/netinet6/ip6_mroute.c
index 44a96cb5..3188a13e 100644
--- a/freebsd/sys/netinet6/ip6_mroute.c
+++ b/freebsd/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/ip6_output.c b/freebsd/sys/netinet6/ip6_output.c
index 19c430a6..a92e68ec 100644
--- a/freebsd/sys/netinet6/ip6_output.c
+++ b/freebsd/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/mld6.c b/freebsd/sys/netinet6/mld6.c
index 5f9b4ffa..d2fd82b7 100644
--- a/freebsd/sys/netinet6/mld6.c
+++ b/freebsd/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2009 Bruce Simpson.
diff --git a/freebsd/sys/netinet6/nd6.c b/freebsd/sys/netinet6/nd6.c
index 89b15e56..ead44620 100644
--- a/freebsd/sys/netinet6/nd6.c
+++ b/freebsd/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/nd6_nbr.c b/freebsd/sys/netinet6/nd6_nbr.c
index 63fb25c8..a67fc68f 100644
--- a/freebsd/sys/netinet6/nd6_nbr.c
+++ b/freebsd/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/nd6_rtr.c b/freebsd/sys/netinet6/nd6_rtr.c
index 4da54fa6..d73ac569 100644
--- a/freebsd/sys/netinet6/nd6_rtr.c
+++ b/freebsd/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/raw_ip6.c b/freebsd/sys/netinet6/raw_ip6.c
index 45645e29..06d16034 100644
--- a/freebsd/sys/netinet6/raw_ip6.c
+++ b/freebsd/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/route6.c b/freebsd/sys/netinet6/route6.c
index a674b45e..f91b9ea8 100644
--- a/freebsd/sys/netinet6/route6.c
+++ b/freebsd/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netinet6/scope6.c b/freebsd/sys/netinet6/scope6.c
index a5c7d7b1..f891c9ce 100644
--- a/freebsd/sys/netinet6/scope6.c
+++ b/freebsd/sys/netinet6/scope6.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 2000 WIDE Project.
diff --git a/freebsd/sys/netinet6/sctp6_usrreq.c b/freebsd/sys/netinet6/sctp6_usrreq.c
index 0551d48b..65253fbb 100644
--- a/freebsd/sys/netinet6/sctp6_usrreq.c
+++ b/freebsd/sys/netinet6/sctp6_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
diff --git a/freebsd/sys/netinet6/udp6_usrreq.c b/freebsd/sys/netinet6/udp6_usrreq.c
index 2c2559fb..260aedf0 100644
--- a/freebsd/sys/netinet6/udp6_usrreq.c
+++ b/freebsd/sys/netinet6/udp6_usrreq.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c
index 4c19caec..dcf40918 100644
--- a/freebsd/sys/netipsec/ipsec.c
+++ b/freebsd/sys/netipsec/ipsec.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
diff --git a/freebsd/sys/netipsec/ipsec_input.c b/freebsd/sys/netipsec/ipsec_input.c
index ace3eaea..9a491d41 100644
--- a/freebsd/sys/netipsec/ipsec_input.c
+++ b/freebsd/sys/netipsec/ipsec_input.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
diff --git a/freebsd/sys/netipsec/ipsec_mbuf.c b/freebsd/sys/netipsec/ipsec_mbuf.c
index 24e1ea81..43a24b0a 100644
--- a/freebsd/sys/netipsec/ipsec_mbuf.c
+++ b/freebsd/sys/netipsec/ipsec_mbuf.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/netipsec/ipsec_output.c b/freebsd/sys/netipsec/ipsec_output.c
index 9f7051f7..b4ad609f 100644
--- a/freebsd/sys/netipsec/ipsec_output.c
+++ b/freebsd/sys/netipsec/ipsec_output.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c
index 0252730f..57e8714e 100644
--- a/freebsd/sys/netipsec/key.c
+++ b/freebsd/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c
index 0fc9308f..3094f3fa 100644
--- a/freebsd/sys/netipsec/key_debug.c
+++ b/freebsd/sys/netipsec/key_debug.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c
index 21502bb9..e3ebc49a 100644
--- a/freebsd/sys/netipsec/keysock.c
+++ b/freebsd/sys/netipsec/keysock.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
diff --git a/freebsd/sys/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c
index 98d319ce..cf4fa37a 100644
--- a/freebsd/sys/netipsec/xform_ah.c
+++ b/freebsd/sys/netipsec/xform_ah.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
diff --git a/freebsd/sys/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c
index 4e52cde1..9d4df589 100644
--- a/freebsd/sys/netipsec/xform_esp.c
+++ b/freebsd/sys/netipsec/xform_esp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
diff --git a/freebsd/sys/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c
index c4048cc9..c3134bdf 100644
--- a/freebsd/sys/netipsec/xform_ipcomp.c
+++ b/freebsd/sys/netipsec/xform_ipcomp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
diff --git a/freebsd/sys/netipsec/xform_ipip.c b/freebsd/sys/netipsec/xform_ipip.c
index 87214ec0..ece6cbc7 100644
--- a/freebsd/sys/netipsec/xform_ipip.c
+++ b/freebsd/sys/netipsec/xform_ipip.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
diff --git a/freebsd/sys/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c
index ca1a3a1b..398dca13 100644
--- a/freebsd/sys/netipsec/xform_tcp.c
+++ b/freebsd/sys/netipsec/xform_tcp.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
diff --git a/freebsd/sys/nios2/nios2/in_cksum.c b/freebsd/sys/nios2/nios2/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/nios2/nios2/in_cksum.c
+++ b/freebsd/sys/nios2/nios2/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/nios2/nios2/legacy.c b/freebsd/sys/nios2/nios2/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/nios2/nios2/legacy.c
+++ b/freebsd/sys/nios2/nios2/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/nios2/pci/pci_bus.c b/freebsd/sys/nios2/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/nios2/pci/pci_bus.c
+++ b/freebsd/sys/nios2/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/opencrypto/cast.c b/freebsd/sys/opencrypto/cast.c
index 53fe23b1..62aa04ca 100644
--- a/freebsd/sys/opencrypto/cast.c
+++ b/freebsd/sys/opencrypto/cast.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: cast.c,v 1.2 2000/06/06 06:49:47 deraadt Exp $ */
/*-
diff --git a/freebsd/sys/opencrypto/criov.c b/freebsd/sys/opencrypto/criov.c
index 63ba4c66..efcbee1d 100644
--- a/freebsd/sys/opencrypto/criov.c
+++ b/freebsd/sys/opencrypto/criov.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $ */
diff --git a/freebsd/sys/opencrypto/crypto.c b/freebsd/sys/opencrypto/crypto.c
index 2a1b3ed0..ee8dbc2b 100644
--- a/freebsd/sys/opencrypto/crypto.c
+++ b/freebsd/sys/opencrypto/crypto.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2006 Sam Leffler. All rights reserved.
diff --git a/freebsd/sys/opencrypto/cryptodev.c b/freebsd/sys/opencrypto/cryptodev.c
index 71cc5b23..441a6829 100644
--- a/freebsd/sys/opencrypto/cryptodev.c
+++ b/freebsd/sys/opencrypto/cryptodev.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $ */
diff --git a/freebsd/sys/opencrypto/cryptosoft.c b/freebsd/sys/opencrypto/cryptosoft.c
index cee58527..6c934d76 100644
--- a/freebsd/sys/opencrypto/cryptosoft.c
+++ b/freebsd/sys/opencrypto/cryptosoft.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
diff --git a/freebsd/sys/opencrypto/deflate.c b/freebsd/sys/opencrypto/deflate.c
index cc38f600..f8a46405 100644
--- a/freebsd/sys/opencrypto/deflate.c
+++ b/freebsd/sys/opencrypto/deflate.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
diff --git a/freebsd/sys/opencrypto/rmd160.c b/freebsd/sys/opencrypto/rmd160.c
index 92b5c2e7..e8beb811 100644
--- a/freebsd/sys/opencrypto/rmd160.c
+++ b/freebsd/sys/opencrypto/rmd160.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $ */
/*-
diff --git a/freebsd/sys/opencrypto/skipjack.c b/freebsd/sys/opencrypto/skipjack.c
index 08edc4c2..e22044ff 100644
--- a/freebsd/sys/opencrypto/skipjack.c
+++ b/freebsd/sys/opencrypto/skipjack.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: skipjack.c,v 1.3 2001/05/05 00:31:34 angelos Exp $ */
/*-
diff --git a/freebsd/sys/opencrypto/xform.c b/freebsd/sys/opencrypto/xform.c
index 7fceb4ec..2e66d289 100644
--- a/freebsd/sys/opencrypto/xform.c
+++ b/freebsd/sys/opencrypto/xform.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $ */
/*-
diff --git a/freebsd/sys/powerpc/pci/pci_bus.c b/freebsd/sys/powerpc/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/powerpc/pci/pci_bus.c
+++ b/freebsd/sys/powerpc/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/powerpc/powerpc/in_cksum.c b/freebsd/sys/powerpc/powerpc/in_cksum.c
index 62e45e18..f17d1092 100644
--- a/freebsd/sys/powerpc/powerpc/in_cksum.c
+++ b/freebsd/sys/powerpc/powerpc/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/* $FreeBSD$ */
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
diff --git a/freebsd/sys/powerpc/powerpc/legacy.c b/freebsd/sys/powerpc/powerpc/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/powerpc/powerpc/legacy.c
+++ b/freebsd/sys/powerpc/powerpc/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/sh/pci/pci_bus.c b/freebsd/sys/sh/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/sh/pci/pci_bus.c
+++ b/freebsd/sys/sh/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/sh/sh/in_cksum.c b/freebsd/sys/sh/sh/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/sh/sh/in_cksum.c
+++ b/freebsd/sys/sh/sh/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/sh/sh/legacy.c b/freebsd/sys/sh/sh/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/sh/sh/legacy.c
+++ b/freebsd/sys/sh/sh/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/sparc/pci/pci_bus.c b/freebsd/sys/sparc/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/sparc/pci/pci_bus.c
+++ b/freebsd/sys/sparc/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/sparc/sparc/in_cksum.c b/freebsd/sys/sparc/sparc/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/sparc/sparc/in_cksum.c
+++ b/freebsd/sys/sparc/sparc/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/sparc/sparc/legacy.c b/freebsd/sys/sparc/sparc/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/sparc/sparc/legacy.c
+++ b/freebsd/sys/sparc/sparc/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/sparc64/pci/pci_bus.c b/freebsd/sys/sparc64/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/sparc64/pci/pci_bus.c
+++ b/freebsd/sys/sparc64/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/sparc64/sparc64/in_cksum.c b/freebsd/sys/sparc64/sparc64/in_cksum.c
index f023f767..845688a5 100644
--- a/freebsd/sys/sparc64/sparc64/in_cksum.c
+++ b/freebsd/sys/sparc64/sparc64/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/freebsd/sys/sparc64/sparc64/legacy.c b/freebsd/sys/sparc64/sparc64/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/sparc64/sparc64/legacy.c
+++ b/freebsd/sys/sparc64/sparc64/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/v850/pci/pci_bus.c b/freebsd/sys/v850/pci/pci_bus.c
index 75b169eb..53446262 100644
--- a/freebsd/sys/v850/pci/pci_bus.c
+++ b/freebsd/sys/v850/pci/pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
diff --git a/freebsd/sys/v850/v850/in_cksum.c b/freebsd/sys/v850/v850/in_cksum.c
index c6f7b568..7c680bbe 100644
--- a/freebsd/sys/v850/v850/in_cksum.c
+++ b/freebsd/sys/v850/v850/in_cksum.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 1988, 1992, 1993
diff --git a/freebsd/sys/v850/v850/legacy.c b/freebsd/sys/v850/v850/legacy.c
index 70bdcebc..d2b0a78a 100644
--- a/freebsd/sys/v850/v850/legacy.c
+++ b/freebsd/sys/v850/v850/legacy.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright 1998 Massachusetts Institute of Technology
diff --git a/freebsd/sys/vm/uma_core.c b/freebsd/sys/vm/uma_core.c
index c30d516b..e6ac69ca 100644
--- a/freebsd/sys/vm/uma_core.c
+++ b/freebsd/sys/vm/uma_core.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*-
* Copyright (c) 2002-2005, 2009 Jeffrey Roberson <jeff@FreeBSD.org>
diff --git a/rtemsbsd/include/machine/atomic.h b/rtemsbsd/include/machine/atomic.h
index 3ab06579..20ca8e29 100644
--- a/rtemsbsd/include/machine/atomic.h
+++ b/rtemsbsd/include/machine/atomic.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_ATOMIC_H_
#define _RTEMS_BSD_MACHINE_ATOMIC_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#include <rtems.h>
diff --git a/rtemsbsd/include/machine/bus.h b/rtemsbsd/include/machine/bus.h
index 64616d30..01731701 100644
--- a/rtemsbsd/include/machine/bus.h
+++ b/rtemsbsd/include/machine/bus.h
@@ -118,8 +118,8 @@
#ifndef _RTEMS_BSD_MACHINE_BUS_H_
#define _RTEMS_BSD_MACHINE_BUS_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
/*
diff --git a/rtemsbsd/include/machine/bus_dma.h b/rtemsbsd/include/machine/bus_dma.h
index d4a1cfb8..c83b1580 100644
--- a/rtemsbsd/include/machine/bus_dma.h
+++ b/rtemsbsd/include/machine/bus_dma.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_BUS_DMA_H_
#define _RTEMS_BSD_MACHINE_BUS_DMA_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#include <sys/bus_dma.h>
diff --git a/rtemsbsd/include/machine/clock.h b/rtemsbsd/include/machine/clock.h
index 9f40d413..be73d490 100644
--- a/rtemsbsd/include/machine/clock.h
+++ b/rtemsbsd/include/machine/clock.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_CLOCK_H_
#define _RTEMS_BSD_MACHINE_CLOCK_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#ifdef _KERNEL
diff --git a/rtemsbsd/include/machine/cpu.h b/rtemsbsd/include/machine/cpu.h
index 7ac6e33d..32881325 100644
--- a/rtemsbsd/include/machine/cpu.h
+++ b/rtemsbsd/include/machine/cpu.h
@@ -18,8 +18,8 @@
#ifndef _RTEMS_BSD_MACHINE_CPU_H_
#define _RTEMS_BSD_MACHINE_CPU_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#define cpu_spinwait() do { } while (0)
diff --git a/rtemsbsd/include/machine/proc.h b/rtemsbsd/include/machine/proc.h
index 6873e087..6f27bd54 100644
--- a/rtemsbsd/include/machine/proc.h
+++ b/rtemsbsd/include/machine/proc.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_PROC_H_
#define _RTEMS_BSD_MACHINE_PROC_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
struct mdthread {
diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
index 066bcdfb..906613f1 100644
--- a/rtemsbsd/include/machine/rtems-bsd-config.h.in
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
@@ -37,8 +37,8 @@
* SUCH DAMAGE.
*/
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#define _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#define _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
/* FIXME: Update Newlib */
#define MSIZE 256
@@ -80,4 +80,4 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c
#define BSD_DEFAULT_PRISON (&prison0)
-#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ */
+#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ */
diff --git a/rtemsbsd/include/machine/runq.h b/rtemsbsd/include/machine/runq.h
index affc070d..98a51a47 100644
--- a/rtemsbsd/include/machine/runq.h
+++ b/rtemsbsd/include/machine/runq.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_RUNQ_H_
#define _RTEMS_BSD_MACHINE_RUNQ_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#define RQB_LEN 0
diff --git a/rtemsbsd/include/machine/signal.h b/rtemsbsd/include/machine/signal.h
index 0e71cabb..6d3f3927 100644
--- a/rtemsbsd/include/machine/signal.h
+++ b/rtemsbsd/include/machine/signal.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_SIGNAL_H_
#define _RTEMS_BSD_MACHINE_SIGNAL_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#endif /* _RTEMS_BSD_MACHINE_SIGNAL_H_ */
diff --git a/rtemsbsd/include/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h
index 7535272e..ad7f2eff 100644
--- a/rtemsbsd/include/machine/stdarg.h
+++ b/rtemsbsd/include/machine/stdarg.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_STDARG_H_
#define _RTEMS_BSD_MACHINE_STDARG_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
#endif /* _RTEMS_BSD_MACHINE_STDARG_H_ */
diff --git a/rtemsbsd/include/machine/ucontext.h b/rtemsbsd/include/machine/ucontext.h
index 92d2b5d2..9845bf3e 100644
--- a/rtemsbsd/include/machine/ucontext.h
+++ b/rtemsbsd/include/machine/ucontext.h
@@ -23,8 +23,8 @@
#ifndef _RTEMS_BSD_MACHINE_UCONTEXT_H_
#define _RTEMS_BSD_MACHINE_UCONTEXT_H_
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
#endif
typedef int mcontext_t;
diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
index f758bf4d..31259ce6 100644
--- a/rtemsbsd/local/bus_if.c
+++ b/rtemsbsd/local/bus_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/cryptodev_if.c b/rtemsbsd/local/cryptodev_if.c
index 6b252130..9b948816 100644
--- a/rtemsbsd/local/cryptodev_if.c
+++ b/rtemsbsd/local/cryptodev_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/device_if.c b/rtemsbsd/local/device_if.c
index 3bdedbc5..1c04d55d 100644
--- a/rtemsbsd/local/device_if.c
+++ b/rtemsbsd/local/device_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c
index 6fbdd911..433e7a67 100644
--- a/rtemsbsd/local/miibus_if.c
+++ b/rtemsbsd/local/miibus_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/pci_if.c b/rtemsbsd/local/pci_if.c
index fddebdca..7531ee15 100644
--- a/rtemsbsd/local/pci_if.c
+++ b/rtemsbsd/local/pci_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c
index 82a5965c..cc036b4f 100644
--- a/rtemsbsd/local/pcib_if.c
+++ b/rtemsbsd/local/pcib_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/local/usb_if.c b/rtemsbsd/local/usb_if.c
index 5277e529..d88ab545 100644
--- a/rtemsbsd/local/usb_if.c
+++ b/rtemsbsd/local/usb_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*
* This file is produced automatically.
diff --git a/rtemsbsd/rtems/rtems-bsd-assert.c b/rtemsbsd/rtems/rtems-bsd-assert.c
index 410f1026..3ebe19e7 100644
--- a/rtemsbsd/rtems/rtems-bsd-assert.c
+++ b/rtemsbsd/rtems/rtems-bsd-assert.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-autoconf.c b/rtemsbsd/rtems/rtems-bsd-autoconf.c
index 5febcbcc..ea250c05 100644
--- a/rtemsbsd/rtems/rtems-bsd-autoconf.c
+++ b/rtemsbsd/rtems/rtems-bsd-autoconf.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c b/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
index 9056b489..c435fd74 100644
--- a/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
+++ b/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-bus-dma.h>
#include <sys/mbuf.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-bus-dma.c b/rtemsbsd/rtems/rtems-bsd-bus-dma.c
index 34f46eed..1d4d120a 100644
--- a/rtemsbsd/rtems/rtems-bsd-bus-dma.c
+++ b/rtemsbsd/rtems/rtems-bsd-bus-dma.c
@@ -45,7 +45,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-cache.h>
#include <machine/rtems-bsd-bus-dma.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-cam.c b/rtemsbsd/rtems/rtems-bsd-cam.c
index e401d24e..ab15f426 100644
--- a/rtemsbsd/rtems/rtems-bsd-cam.c
+++ b/rtemsbsd/rtems/rtems-bsd-cam.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-chunk.c b/rtemsbsd/rtems/rtems-bsd-chunk.c
index b70eedfe..2e64d87b 100644
--- a/rtemsbsd/rtems/rtems-bsd-chunk.c
+++ b/rtemsbsd/rtems/rtems-bsd-chunk.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-chunk.h>
#include <sys/malloc.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-condvar.c b/rtemsbsd/rtems/rtems-bsd-condvar.c
index 924de070..a657a7d2 100644
--- a/rtemsbsd/rtems/rtems-bsd-condvar.c
+++ b/rtemsbsd/rtems/rtems-bsd-condvar.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-conf.c b/rtemsbsd/rtems/rtems-bsd-conf.c
index bb1666c2..d52ad198 100644
--- a/rtemsbsd/rtems/rtems-bsd-conf.c
+++ b/rtemsbsd/rtems/rtems-bsd-conf.c
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <stdio.h>
#include <rtems.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-delay.c b/rtemsbsd/rtems/rtems-bsd-delay.c
index b8e0eb33..a698117c 100644
--- a/rtemsbsd/rtems/rtems-bsd-delay.c
+++ b/rtemsbsd/rtems/rtems-bsd-delay.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-generic.c b/rtemsbsd/rtems/rtems-bsd-generic.c
index b7d7e110..6ac02053 100644
--- a/rtemsbsd/rtems/rtems-bsd-generic.c
+++ b/rtemsbsd/rtems/rtems-bsd-generic.c
@@ -38,7 +38,7 @@
*/
#include <rtems/bsd/sys/types.h> //needed for fd_mask and such
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-get-file.c b/rtemsbsd/rtems/rtems-bsd-get-file.c
index 738a62cb..6d321c30 100644
--- a/rtemsbsd/rtems/rtems-bsd-get-file.c
+++ b/rtemsbsd/rtems/rtems-bsd-get-file.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <sys/file.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-init-with-irq.c b/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
index c2966d66..0f472528 100644
--- a/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
+++ b/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <rtems/irq-extension.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-init.c b/rtemsbsd/rtems/rtems-bsd-init.c
index f970902b..613cab3d 100644
--- a/rtemsbsd/rtems/rtems-bsd-init.c
+++ b/rtemsbsd/rtems/rtems-bsd-init.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-jail.c b/rtemsbsd/rtems/rtems-bsd-jail.c
index 819d48d8..0c7ab4f9 100644
--- a/rtemsbsd/rtems/rtems-bsd-jail.c
+++ b/rtemsbsd/rtems/rtems-bsd-jail.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/*#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-kern_synch.c b/rtemsbsd/rtems/rtems-bsd-kern_synch.c
index 40f3280a..68bc5f9d 100644
--- a/rtemsbsd/rtems/rtems-bsd-kern_synch.c
+++ b/rtemsbsd/rtems/rtems-bsd-kern_synch.c
@@ -53,7 +53,7 @@
* @(#)kern_synch.c 8.9 (Berkeley) 5/19/95
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <rtems/score/statesimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-lock.c b/rtemsbsd/rtems/rtems-bsd-lock.c
index fbcc6710..9dce5811 100644
--- a/rtemsbsd/rtems/rtems-bsd-lock.c
+++ b/rtemsbsd/rtems/rtems-bsd-lock.c
@@ -40,7 +40,7 @@
/* Necessary to obtain some internal functions */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-log.c b/rtemsbsd/rtems/rtems-bsd-log.c
index fee0b1cc..4afc16b9 100644
--- a/rtemsbsd/rtems/rtems-bsd-log.c
+++ b/rtemsbsd/rtems/rtems-bsd-log.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-malloc.c b/rtemsbsd/rtems/rtems-bsd-malloc.c
index 4cf930ef..fe0d01db 100644
--- a/rtemsbsd/rtems/rtems-bsd-malloc.c
+++ b/rtemsbsd/rtems/rtems-bsd-malloc.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-mutex.c b/rtemsbsd/rtems/rtems-bsd-mutex.c
index 02960f9a..0a3c7fbd 100644
--- a/rtemsbsd/rtems/rtems-bsd-mutex.c
+++ b/rtemsbsd/rtems/rtems-bsd-mutex.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-nexus.c b/rtemsbsd/rtems/rtems-bsd-nexus.c
index 1c2ef7a3..a23f5abe 100644
--- a/rtemsbsd/rtems/rtems-bsd-nexus.c
+++ b/rtemsbsd/rtems/rtems-bsd-nexus.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-sysinit.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-panic.c b/rtemsbsd/rtems/rtems-bsd-panic.c
index 859c34e0..9634e193 100644
--- a/rtemsbsd/rtems/rtems-bsd-panic.c
+++ b/rtemsbsd/rtems/rtems-bsd-panic.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-pci_bus.c b/rtemsbsd/rtems/rtems-bsd-pci_bus.c
index 51ae99c1..f673083b 100644
--- a/rtemsbsd/rtems/rtems-bsd-pci_bus.c
+++ b/rtemsbsd/rtems/rtems-bsd-pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/**
* @file
diff --git a/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c b/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
index 15c56b8b..f126c31f 100644
--- a/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
+++ b/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
/**
* @file
diff --git a/rtemsbsd/rtems/rtems-bsd-program.c b/rtemsbsd/rtems/rtems-bsd-program.c
index f6a63ff7..8edd8f93 100644
--- a/rtemsbsd/rtems/rtems-bsd-program.c
+++ b/rtemsbsd/rtems/rtems-bsd-program.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-rwlock.c b/rtemsbsd/rtems/rtems-bsd-rwlock.c
index 5817aae9..58e44392 100644
--- a/rtemsbsd/rtems/rtems-bsd-rwlock.c
+++ b/rtemsbsd/rtems/rtems-bsd-rwlock.c
@@ -45,7 +45,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-shell.c b/rtemsbsd/rtems/rtems-bsd-shell.c
index 014f825c..2fa1aaa3 100644
--- a/rtemsbsd/rtems/rtems-bsd-shell.c
+++ b/rtemsbsd/rtems/rtems-bsd-shell.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-signal.c b/rtemsbsd/rtems/rtems-bsd-signal.c
index 1d431eb6..44fa8167 100644
--- a/rtemsbsd/rtems/rtems-bsd-signal.c
+++ b/rtemsbsd/rtems/rtems-bsd-signal.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-support.c b/rtemsbsd/rtems/rtems-bsd-support.c
index c86365da..1d1baa45 100644
--- a/rtemsbsd/rtems/rtems-bsd-support.c
+++ b/rtemsbsd/rtems/rtems-bsd-support.c
@@ -39,7 +39,7 @@
/* FIXME: This file needs careful review. */
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/score/threaddispatch.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sx.c b/rtemsbsd/rtems/rtems-bsd-sx.c
index f847cfb8..948297f9 100644
--- a/rtemsbsd/rtems/rtems-bsd-sx.c
+++ b/rtemsbsd/rtems/rtems-bsd-sx.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctl.c b/rtemsbsd/rtems/rtems-bsd-sysctl.c
index c97ef07f..f9ecab81 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctl.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctl.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-syscall-api.h>
#include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c b/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
index 37a4f8df..ced85f7c 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
@@ -18,7 +18,7 @@
*
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-syscall-api.h>
#include <sys/cdefs.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c b/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
index 496cafae..62ce6b80 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-syscall-api.h>
#include <sys/cdefs.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-thread.c b/rtemsbsd/rtems/rtems-bsd-thread.c
index 0d893a32..8cb09d7e 100644
--- a/rtemsbsd/rtems/rtems-bsd-thread.c
+++ b/rtemsbsd/rtems/rtems-bsd-thread.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-timesupport.c b/rtemsbsd/rtems/rtems-bsd-timesupport.c
index 7090dfcf..a7eedee1 100644
--- a/rtemsbsd/rtems/rtems-bsd-timesupport.c
+++ b/rtemsbsd/rtems/rtems-bsd-timesupport.c
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <sys/time.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
index b9bc7244..b7e3188e 100644
--- a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
@@ -12,7 +12,7 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
index 72077906..bfb3c8c7 100644
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
@@ -12,7 +12,7 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
index ee3a0ebf..264f9619 100644
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
@@ -12,7 +12,7 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
diff --git a/testsuite/rwlock01/test_main.c b/testsuite/rwlock01/test_main.c
index e5015ab7..53919d30 100644
--- a/testsuite/rwlock01/test_main.c
+++ b/testsuite/rwlock01/test_main.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>
diff --git a/testsuite/sleep01/test_main.c b/testsuite/sleep01/test_main.c
index 929c738d..e5120c0f 100644
--- a/testsuite/sleep01/test_main.c
+++ b/testsuite/sleep01/test_main.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/param.h>
#include <sys/systm.h>
diff --git a/testsuite/swi01/swi_test.c b/testsuite/swi01/swi_test.c
index 093458e7..904c6161 100644
--- a/testsuite/swi01/swi_test.c
+++ b/testsuite/swi01/swi_test.c
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <unistd.h>
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <sys/types.h>
#include <sys/systm.h>
diff --git a/testsuite/thread01/test_main.c b/testsuite/thread01/test_main.c
index 643a6ad9..223d21c4 100644
--- a/testsuite/thread01/test_main.c
+++ b/testsuite/thread01/test_main.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c
index 8ce0b41e..e0121b9c 100644
--- a/testsuite/timeout01/timeout_test.c
+++ b/testsuite/timeout01/timeout_test.c
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <unistd.h>
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>