And again... fixed sched_ule.c.
authorJens Krieg <jkrieg@mailbox.tu-berlin.de>
Fri, 13 Dec 2013 12:27:13 +0000 (13:27 +0100)
committerJens Krieg <jkrieg@mailbox.tu-berlin.de>
Fri, 13 Dec 2013 12:27:13 +0000 (13:27 +0100)
sys/conf/kern.pre.mk
sys/kern/sched_ule.c

index 6ac95eb..2016045 100644 (file)
@@ -86,7 +86,7 @@ INCLUDES+= -I$S/dev/cxgb -I$S/dev/cxgbe
 .endif
 
 CFLAGS=        ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
-CFLAGS+= ${INCLUDES} -D_KERNEL -D__FreeBSD_cc_version=900001 -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
+CFLAGS+= ${INCLUDES} -DFW_OS_FREEBSD -D_KERNEL -D__FreeBSD_cc_version=900001 -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
 .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
 .if ${MACHINE_CPUARCH} != "mips"
index 1d16941..210bf05 100644 (file)
  * TODO:
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
-#include "opt_sched.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kdb.h>
-#include <sys/kernel.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
-#include <sys/sched.h>
-#include <sys/sdt.h>
-#include <sys/smp.h>
-#include <sys/sx.h>
-#include <sys/sysctl.h>
-#include <sys/sysproto.h>
-#include <sys/turnstile.h>
-#include <sys/umtx.h>
-#include <sys/vmmeter.h>
-#include <sys/cpuset.h>
-#include <sys/sbuf.h>
-
-#ifdef HWPMC_HOOKS
-#include <sys/pmckern.h>
-#endif
-
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
-int                            dtrace_vtime_active;
-dtrace_vtime_switch_func_t     dtrace_vtime_switch_func;
-#endif
-
-#include <machine/cpu.h>
-#include <machine/smp.h>
-
-#if defined(__powerpc__) && defined(E500)
-#error "This architecture is not currently compatible with ULE"
-#endif
-
-#define        KTR_ULE 0
-
-#define        TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX)))
-#define        TDQ_NAME_LEN    (sizeof("sched lock ") + sizeof(__XSTRING(MAXCPU)))
-#define        TDQ_LOADNAME_LEN        (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1 + sizeof(" load"))
-
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");