Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 66a36a815f0a410f34c462fee1ec2a887a8a91ac..7d565afe35d2fa9ba25359c9bf879d8bde9893e7 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -754,23 +754,27 @@ static inline void ftrace_init(void) { }
 
 /*
  * Structure that defines an entry function trace.
+ * It's already packed but the attribute "packed" is needed
+ * to remove extra padding at the end.
  */
 struct ftrace_graph_ent {
        unsigned long func; /* Current function */
        int depth;
-};
+} __packed;
 
 /*
  * Structure that defines a return function trace.
+ * It's already packed but the attribute "packed" is needed
+ * to remove extra padding at the end.
  */
 struct ftrace_graph_ret {
        unsigned long func; /* Current function */
-       unsigned long long calltime;
-       unsigned long long rettime;
        /* Number of functions that overran the depth limit for current task */
        unsigned long overrun;
+       unsigned long long calltime;
+       unsigned long long rettime;
        int depth;
-};
+} __packed;
 
 /* Type of the callback handlers for tracing function graph*/
 typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *); /* return */