From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 29 Apr 2010 19:40:06 +0000 (+0000)
Subject: net/packet/built-in.o:(.discard+0x0): multiple definition of __pcpu_unique_sknid_elevator
X-Git-Tag: linux-2.6-32-0~17
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=0b68fb975fb59dd3423e8b4853e688a9a5dd3db4

net/packet/built-in.o:(.discard+0x0): multiple definition of __pcpu_unique_sknid_elevator
---

diff --git a/linux-2.6-525-sknid-elevator.patch b/linux-2.6-525-sknid-elevator.patch
index e28a3c9f9..a55145489 100644
--- 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 DEFINE_PER_CPU(int, sknid_elevator);
++DECLARE_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