On Sun, May 17, 2020 at 12:26:43PM +0200, Thomas Gleixner wrote: > Paul, > > "Paul E. McKenney" <paulmck@xxxxxxxxxx> writes: > > And I have allegedly resolved the conflicts with Thomas's and Peter's > > series, or at least the noinstr-rcu-nmi-2020-05-15 branch of that series. > > At least one conflict was completely invisible to "git rebase" (but > > fortunately blindingly obvious to the compiler). This naturally makes > > me suspect that additional adjustments might be needed. Especially > > given that misplaced instrumentation_begin() and instrumentation_end() > > calls are invisible not only to the compiler, but also to rcutorture in > > my setup. (For example, tracing before instrumentation_begin() or after > > instrumentation_end() is a bug.) > > there is tooling to verify that. If you merge > > git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git entry-v7-full > > into your dev branch (trivial conflict) and after building it, run: > > objtool check -fal $BUILDIR/vmlinux.o The conflict was trivial, but for future reference, where should I be getting the proper objtool from? Thanx, Paul
