From 21c519918d4e2fe1f0c307ad81704f75ddd43fa4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 20 Dec 2020 21:41:19 +0000 Subject: [PATCH] regression tests: Disable branch profiling in the kernel configuration git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9223 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 22 ---------------------- scripts/run-regression-tests | 1 + 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index 1b9a20370..541361bab 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -211,28 +211,6 @@ EOF ;; esac - if [ "$1" = "2.6.29" ] || [ "$1" = "2.6.29.1" ] || [ "$1" = "2.6.29.2" ] || - [ "$1" = "2.6.29.3" ]; then - patch -f -s -p1 <<'EOF' -Make sure that branch profiling does not trigger sparse warnings. -See also http://bugzilla.kernel.org/show_bug.cgi?id=12925 ---- -See also http://lkml.org/lkml/2009/4/5/120 ---- orig/linux-2.6.29/include/linux/compiler.h 2009-03-23 19:12:14.000000000 -0400 -+++ linux-2.6.29/include/linux/compiler.h 2009-03-24 08:46:46.000000000 -0400 -@@ -75,7 +75,8 @@ struct ftrace_branch_data { - * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code - * to disable branch tracing on a per file basis. - */ --#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING) -+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \ -+ && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__) - void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - - #define likely_notrace(x) __builtin_expect(!!(x), 1) -EOF - fi - if [ "${1#2.6.31}" != "$1" ]; then patch -f -s -p1 <<'EOF' Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index e8546791e..3520f1d55 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -304,6 +304,7 @@ CONFIG_STACK_TRACER \ CONFIG_STACK_VALIDATION \ CONFIG_TRACEPOINTS \ CONFIG_TRACER_MAX_TRACE \ +CONFIG_TRACE_BRANCH_PROFILING \ CONFIG_TRACING \ CONFIG_UNWINDER_ORC \ CONFIG_X86_32 \