diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-29 14:58:57 +0200 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-06-14 18:38:17 +0400 |
commit | fe31997fb265500c5b0253a375497b689a94cc36 (patch) | |
tree | 92ffe818ddcd774edf34ac9a53a4d89daf819925 | |
parent | 381a1e0af2405a83acfb83f7cca32696770b303f (diff) |
kconfig-preempt-rt-full.patchtracking-preempt-rt-patch-linaro-preempt-rt-20130618.0
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | init/Makefile | 2 | ||||
-rw-r--r-- | kernel/Kconfig.preempt | 8 | ||||
-rwxr-xr-x | scripts/mkcompile_h | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/init/Makefile b/init/Makefile index 7bc47ee31c3..88cf473554e 100644 --- a/init/Makefile +++ b/init/Makefile @@ -33,4 +33,4 @@ silent_chk_compile.h = : include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ - "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" + "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)" diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt index 574a8550626..38cecfe3c5d 100644 --- a/kernel/Kconfig.preempt +++ b/kernel/Kconfig.preempt @@ -73,6 +73,14 @@ config PREEMPT_RTB enables changes which are preliminary for the full preemptiple RT kernel. +config PREEMPT_RT_FULL + bool "Fully Preemptible Kernel (RT)" + depends on IRQ_FORCED_THREADING + select PREEMPT_RT_BASE + select PREEMPT_RCU + help + All and everything + endchoice config PREEMPT_COUNT diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index f221ddf6908..5f440097f6d 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -4,7 +4,8 @@ TARGET=$1 ARCH=$2 SMP=$3 PREEMPT=$4 -CC=$5 +RT=$5 +CC=$6 vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; } @@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION" CONFIG_FLAGS="" if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi +if [ -n "$RT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS RT"; fi UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" # Truncate to maximum length |