From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 May 2018 18:02:54 +0000 (-0700)
Subject: Merge tag 'trace-v4.17-rc5-vsprintf' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.19~1037
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d38cd06c3e332093da2c486307395b302e2e31f;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'trace-v4.17-rc5-vsprintf' of git://git./linux/kernel/git/rostedt/linux-trace

Pull memory barrier for from Steven Rostedt:
 "The memory barrier usage in updating the random ptr hash for %p in
  vsprintf is incorrect.

  Instead of adding the read memory barrier into vsprintf() which will
  cause a slight degradation to a commonly used function in the kernel
  just to solve a very unlikely race condition that can only happen at
  boot up, change the code from using a variable branch to a
  static_branch.

  Not only does this solve the race condition, it actually will improve
  the performance of vsprintf() by removing the conditional branch that
  is only needed at boot"

* tag 'trace-v4.17-rc5-vsprintf' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  vsprintf: Replace memory barrier with static_key for random_ptr_key update
---

9d38cd06c3e332093da2c486307395b302e2e31f