diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-15 08:29:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-15 08:29:44 +0100 |
| commit | 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 (patch) | |
| tree | 7e5f6d050b72ab08a4497e82a4a103fefb086e80 /include/net/sch_generic.h | |
| parent | x86-64, NUMA: Don't call numa_set_distanc() for all possible node combination... (diff) | |
| parent | Linux 2.6.38 (diff) | |
| download | linux-8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2.tar.xz linux-8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2.zip | |
Merge commit 'v2.6.38' into x86/mm
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: Resolve the conflict, update the branch to .38.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 160a407c1963..04f8556313d5 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -199,7 +199,7 @@ struct tcf_proto { struct qdisc_skb_cb { unsigned int pkt_len; - char data[]; + long data[]; }; static inline int qdisc_qlen(struct Qdisc *q) |