Displaying "PREEMPT" on kernel headers when CONFIG_PREEMPT_DYNAMIC=y can be misleading for anybody involved in remote debugging because it is then not guaranteed that there is an actual preemption behaviour. It depends on default Kconfig or boot defined choices. Therefore, tell about PREEMPT_DYNAMIC on static kernel headers and leave the search for the actual preemption behaviour to browsing dmesg.
Unified · Split
| @@ -31,7 +31,8 @@ quiet_cmd_compile.h = CHK $@ · 30 unmodified lines | |||
| 31 | cmd_compile.h = \ | 31 | cmd_compile.h = \ |
| 32 | $(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ | 32 | $(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ |
| 33 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT_BUILD)" \ | 33 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT_BUILD)" \ |
| 34 | "$(CONFIG_PREEMPT_RT)" "$(CONFIG_CC_VERSION_TEXT)" "$(LD)" | 34 | "$(CONFIG_PREEMPT_DYNAMIC)" "$(CONFIG_PREEMPT_RT)" \ |
| 35 | "$(CONFIG_CC_VERSION_TEXT)" "$(LD)" | ||
| 35 | 36 | ||
| 36 | include/generated/compile.h: FORCE | 37 | include/generated/compile.h: FORCE |
| 37 | $(call cmd,compile.h) | 38 | $(call cmd,compile.h) |
| @@ -5,9 +5,10 @@ TARGET=$1 · 4 unmodified lines | |||
| 5 | ARCH=$2 | 5 | ARCH=$2 |
| 6 | SMP=$3 | 6 | SMP=$3 |
| 7 | PREEMPT=$4 | 7 | PREEMPT=$4 |
| 8 | PREEMPT_RT=$5 | 8 | PREEMPT_DYNAMIC=$5 |
| 9 | CC_VERSION="$6" | 9 | PREEMPT_RT=$6 |
| 10 | LD=$7 | 10 | CC_VERSION="$7" |
| 11 | LD=$8 | ||
| 11 | 12 | ||
| 12 | # Do not expand names | 13 | # Do not expand names |
| 13 | set -f | 14 | set -f |
| @@ -41,8 +42,14 @@ fi · 27 unmodified lines | |||
| 41 | UTS_VERSION="#$VERSION" | 42 | UTS_VERSION="#$VERSION" |
| 42 | CONFIG_FLAGS="" | 43 | CONFIG_FLAGS="" |
| 43 | if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi | 44 | if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi |
| 44 | if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi | 45 | |
| 45 | if [ -n "$PREEMPT_RT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT_RT"; fi | 46 | if [ -n "$PREEMPT_RT" ] ; then |
| 47 | CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT_RT" | ||
| 48 | elif [ -n "$PREEMPT_DYNAMIC" ] ; then | ||
| 49 | CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT_DYNAMIC" | ||
| 50 | elif [ -n "$PREEMPT" ] ; then | ||
| 51 | CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT" | ||
| 52 | fi | ||
| 46 | 53 | ||
| 47 | # Truncate to maximum length | 54 | # Truncate to maximum length |
| 48 | UTS_LEN=64 | 55 | UTS_LEN=64 |