From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Fri, 23 Dec 2016 22:33:22 +0000 (-0500)
Subject: Merge remote branch 'ca-git-uek/topic/uek-4.1/stable-cherry-picks' into official... 
X-Git-Tag: v4.1.12-92~25^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=046275304f55b8ba93d1a10ee4a08c0b1984a92c;p=users%2Fjedix%2Flinux-maple.git

Merge remote branch 'ca-git-uek/topic/uek-4.1/stable-cherry-picks' into official/topic/uek-4.1/dtrace
---

046275304f55b8ba93d1a10ee4a08c0b1984a92c
diff --cc include/linux/tracepoint.h
index 4ab84ae8e3fd,a6e1bca88cc6..0886936acf8d
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@@ -14,11 -14,12 +14,13 @@@
   * See the file COPYING for more details.
   */
  
+ #include <linux/smp.h>
  #include <linux/errno.h>
  #include <linux/types.h>
+ #include <linux/cpumask.h>
  #include <linux/rcupdate.h>
  #include <linux/static_key.h>
 +#include <linux/sdt.h>
  
  struct module;
  struct tracepoint;