compat-wireless: Fix the bleeding-edge version to build on 2.6.27
authorLarry Finger <Larry.Finger@lwfinger.net>
Fri, 2 Oct 2009 01:23:13 +0000 (20:23 -0500)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Fri, 2 Oct 2009 20:40:40 +0000 (13:40 -0700)
When building the bleeding-edge compat-wireless for kernel 2.6.27,
several compilation errors were detected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
compat/compat-2.6.28.c
compat/compat-2.6.28.h

index 33871a224b235881dc36fac396548ea579a24911..613b0096a46bb8a8f9da07fd469f9e99e7ff320f 100644 (file)
@@ -260,6 +260,7 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,
        return j;
 }
 
+#if 0
 /**
  * round_jiffies_up - function to round jiffies up to a full second
  * @j: the time in (absolute) jiffies that should be rounded
@@ -274,5 +275,6 @@ unsigned long round_jiffies_up(unsigned long j)
        return round_jiffies_common(j, raw_smp_processor_id(), true);
 }
 EXPORT_SYMBOL_GPL(round_jiffies_up);
+#endif
 
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
index e25259f39fa82e876d1180c730bab1b44b14eb88..4e5a2ef82ecdedb89c099f39501e446bc1341045 100644 (file)
@@ -149,6 +149,7 @@ static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,
 struct module;
 struct tracepoint;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
 struct tracepoint {
        const char *name;               /* Tracepoint name */
        int state;                      /* State. */
@@ -159,6 +160,7 @@ struct tracepoint {
                                         * align these on the structure size.
                                         * Keep in sync with vmlinux.lds.h.
                                         */
+#endif
 
 #ifndef DECLARE_TRACE
 
@@ -179,13 +181,17 @@ struct tracepoint {
                return -ENOSYS;                                         \
        }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
 #define DEFINE_TRACE(name)
+#endif
 #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
 #define EXPORT_TRACEPOINT_SYMBOL(name)
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
 static inline void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end)
 { }
+#endif
 
 #endif