Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67019157 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'torture.2015.02.23a' into core/rcu 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8bc6782f 4f2a848c

kernel/rcu/update.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ bool rcu_gp_is_normal(void) 
{

	return READ_ONCE(rcu_normal);

}

EXPORT_SYMBOL_GPL(rcu_gp_is_normal);



static atomic_t rcu_expedited_nesting =

	ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);

tools/testing/selftests/rcutorture/bin/parse-console.sh

+4 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ if grep -Pq '\x00' < $file 
then

	print_warning Console output contains nul bytes, old qemu still running?

fi

egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls on CPUs/tasks:|Stall ended before state dump start' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $1.diags

egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $1.diags

if test -s $1.diags

then

	print_warning Assertion failure in $file $title
@@ -64,10 +64,12 @@ then 
	then

		summary="$summary  lockdep: $n_badness"

	fi

	n_stalls=`egrep -c 'detected stalls on CPUs/tasks:|Stall ended before state dump start' $1`

	n_stalls=`egrep -c 'detected stalls on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump start|\?\?\? Writer stall state' $1`

	if test "$n_stalls" -ne 0

	then

		summary="$summary  Stalls: $n_stalls"

	fi

	print_warning Summary: $summary

else

	rm $1.diags

fi