9 files changed, 89 insertions, 61 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c61fab1dd2f8..0add6b28c366 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -61,6 +61,14 @@
 #define BRANCH_PROFILE()
 #endif
 
+#ifdef CONFIG_EVENT_TRACER
+#define FTRACE_EVENTS() VMLINUX_SYMBOL(__start_ftrace_events) = .;      \
+                        *(_ftrace_events)                               \
+                        VMLINUX_SYMBOL(__stop_ftrace_events) = .;
+#else
+#define FTRACE_EVENTS()
+#endif
+
 /* .data section */
 #define DATA_DATA                                                       \
         *(.data)                                                        \
@@ -81,7 +89,8 @@
         *(__tracepoints)                                                \
         VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
         LIKELY_PROFILE()                                                \
-        BRANCH_PROFILE()
+        BRANCH_PROFILE()                                                \
+        FTRACE_EVENTS()
 
 #define RO_DATA(align)                                                  \
         . = ALIGN((align));                                             \
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index 311315b56b61..fd53bfd26470 100644
--- a/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
@@ -33,7 +33,7 @@
  */
 #define I2C_RETRIES     0x0701  /* number of times a device address should
                                    be polled when not acknowledging */
-#define I2C_TIMEOUT     0x0702  /* set timeout in jiffies - call with int */
+#define I2C_TIMEOUT     0x0702  /* set timeout in units of 10 ms */
 
 /* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
  * are NOT supported! (due to code brokenness)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index fcfbfea3af72..c86c3b07604c 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -361,7 +361,7 @@ struct i2c_adapter {
         struct mutex bus_lock;
         struct mutex clist_lock;
 
-        int timeout;
+        int timeout;                    /* in jiffies */
         int retries;
         struct device dev;              /* the adapter device */
 
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f8ff918c208f..e1ff5b14310e 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -210,6 +210,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
 
         /* Move the mac addresses to the beginning of the new header. */
         memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+        skb->mac_header -= VLAN_HLEN;
 
         /* first, the ethernet type */
         veth->h_vlan_proto = htons(ETH_P_8021Q);
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index cf2cb50f77d1..9dcf956ad18a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -416,15 +416,6 @@ extern void	      skb_over_panic(struct sk_buff *skb, int len,
                                      void *here);
 extern void           skb_under_panic(struct sk_buff *skb, int len,
                                       void *here);
-extern void           skb_truesize_bug(struct sk_buff *skb);
-
-static inline void skb_truesize_check(struct sk_buff *skb)
-{
-        int len = sizeof(struct sk_buff) + skb->len;
-
-        if (unlikely((int)skb->truesize < len))
-                skb_truesize_bug(skb);
-}
 
 extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
                         int getfrag(void *from, char *to, int offset,
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 757005458366..34ae464effff 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -153,4 +153,7 @@ static inline void tracepoint_synchronize_unregister(void)
         synchronize_sched();
 }
 
+#define DEFINE_TRACE_FMT(name, proto, args, fmt)                \
+        DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))
+
 #endif
diff --git a/include/net/sock.h b/include/net/sock.h
index ce3b5b622683..eefeeaf7fc46 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -860,7 +860,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size)
 
 static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)
 {
-        skb_truesize_check(skb);
         sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
         sk->sk_wmem_queued -= skb->truesize;
         sk_mem_uncharge(sk, skb->truesize);
diff --git a/include/trace/sched.h b/include/trace/sched.h
index 0d81098ee9fc..4e372a1a29bf 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -4,53 +4,6 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(sched_kthread_stop,
-        TPPROTO(struct task_struct *t),
-                TPARGS(t));
-
-DECLARE_TRACE(sched_kthread_stop_ret,
-        TPPROTO(int ret),
-                TPARGS(ret));
-
-DECLARE_TRACE(sched_wait_task,
-        TPPROTO(struct rq *rq, struct task_struct *p),
-                TPARGS(rq, p));
-
-DECLARE_TRACE(sched_wakeup,
-        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_wakeup_new,
-        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_switch,
-        TPPROTO(struct rq *rq, struct task_struct *prev,
-                struct task_struct *next),
-                TPARGS(rq, prev, next));
-
-DECLARE_TRACE(sched_migrate_task,
-        TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
-                TPARGS(p, orig_cpu, dest_cpu));
-
-DECLARE_TRACE(sched_process_free,
-        TPPROTO(struct task_struct *p),
-                TPARGS(p));
-
-DECLARE_TRACE(sched_process_exit,
-        TPPROTO(struct task_struct *p),
-                TPARGS(p));
-
-DECLARE_TRACE(sched_process_wait,
-        TPPROTO(struct pid *pid),
-                TPARGS(pid));
-
-DECLARE_TRACE(sched_process_fork,
-        TPPROTO(struct task_struct *parent, struct task_struct *child),
-                TPARGS(parent, child));
-
-DECLARE_TRACE(sched_signal_send,
-        TPPROTO(int sig, struct task_struct *p),
-                TPARGS(sig, p));
+#include <trace/sched_event_types.h>
 
 #endif
diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
new file mode 100644
index 000000000000..a4f662940f4e
--- /dev/null
+++ b/include/trace/sched_event_types.h
@@ -0,0 +1,72 @@
+
+/* use <trace/sched.h> instead */
+#ifndef DEFINE_TRACE_FMT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+DEFINE_TRACE_FMT(sched_kthread_stop,
+        TPPROTO(struct task_struct *t),
+        TPARGS(t),
+        TPFMT("task %s:%d", t->comm, t->pid));
+
+DEFINE_TRACE_FMT(sched_kthread_stop_ret,
+        TPPROTO(int ret),
+        TPARGS(ret),
+        TPFMT("ret=%d", ret));
+
+DEFINE_TRACE_FMT(sched_wait_task,
+        TPPROTO(struct rq *rq, struct task_struct *p),
+        TPARGS(rq, p),
+        TPFMT("task %s:%d", p->comm, p->pid));
+
+DEFINE_TRACE_FMT(sched_wakeup,
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
+        TPARGS(rq, p, success),
+        TPFMT("task %s:%d %s",
+              p->comm, p->pid, success?"succeeded":"failed"));
+
+DEFINE_TRACE_FMT(sched_wakeup_new,
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
+        TPARGS(rq, p, success),
+        TPFMT("task %s:%d",
+              p->comm, p->pid, success?"succeeded":"failed"));
+
+DEFINE_TRACE_FMT(sched_switch,
+        TPPROTO(struct rq *rq, struct task_struct *prev,
+                struct task_struct *next),
+        TPARGS(rq, prev, next),
+        TPFMT("task %s:%d ==> %s:%d",
+              prev->comm, prev->pid, next->comm, next->pid));
+
+DEFINE_TRACE_FMT(sched_migrate_task,
+        TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
+        TPARGS(p, orig_cpu, dest_cpu),
+        TPFMT("task %s:%d from: %d  to: %d",
+              p->comm, p->pid, orig_cpu, dest_cpu));
+
+DEFINE_TRACE_FMT(sched_process_free,
+        TPPROTO(struct task_struct *p),
+        TPARGS(p),
+        TPFMT("task %s:%d", p->comm, p->pid));
+
+DEFINE_TRACE_FMT(sched_process_exit,
+        TPPROTO(struct task_struct *p),
+        TPARGS(p),
+        TPFMT("task %s:%d", p->comm, p->pid));
+
+DEFINE_TRACE_FMT(sched_process_wait,
+        TPPROTO(struct pid *pid),
+        TPARGS(pid),
+        TPFMT("pid %d", pid));
+
+DEFINE_TRACE_FMT(sched_process_fork,
+        TPPROTO(struct task_struct *parent, struct task_struct *child),
+        TPARGS(parent, child),
+        TPFMT("parent %s:%d  child %s:%d",
+              parent->comm, parent->pid, child->comm, child->pid));
+
+DEFINE_TRACE_FMT(sched_signal_send,
+        TPPROTO(int sig, struct task_struct *p),
+        TPARGS(sig, p),
+        TPFMT("sig: %d   task %s:%d", sig, p->comm, p->pid));