git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b08b93e
)
net/packet/built-in.o:(.discard+0x0): multiple definition of __pcpu_unique_sknid_elevator
author
S.Çağlar Onur
<caglar@cs.princeton.edu>
Thu, 29 Apr 2010 19:40:06 +0000
(19:40 +0000)
committer
S.Çağlar Onur
<caglar@cs.princeton.edu>
Thu, 29 Apr 2010 19:40:06 +0000
(19:40 +0000)
linux-2.6-525-sknid-elevator.patch
patch
|
blob
|
history
diff --git
a/linux-2.6-525-sknid-elevator.patch
b/linux-2.6-525-sknid-elevator.patch
index
e28a3c9
..
a551454
100644
(file)
--- a/
linux-2.6-525-sknid-elevator.patch
+++ b/
linux-2.6-525-sknid-elevator.patch
@@
-98,7
+98,7
@@
index 1bd109e..5c2e9ad 100644
static const struct proto_ops packet_ops_spkt;
-+
extern DEFIN
E_PER_CPU(int, sknid_elevator);
++
DECLAR
E_PER_CPU(int, sknid_elevator);
+
+static inline unsigned int slice_check_and_elevate(struct sk_buff *skb, struct sock *sk) {
+ /* This mechanism is quite involved, and caused us a lot of pain