From 7e7c58f5be5ef0163a0852abfdc4b636662c1c9d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 1 Oct 2009 20:23:13 -0500 Subject: [PATCH] compat-wireless: Fix the bleeding-edge version to build on 2.6.27 When building the bleeding-edge compat-wireless for kernel 2.6.27, several compilation errors were detected. Signed-off-by: Larry Finger --- compat/compat-2.6.28.c | 2 ++ compat/compat-2.6.28.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c index 33871a224b23..613b0096a46b 100644 --- a/compat/compat-2.6.28.c +++ b/compat/compat-2.6.28.c @@ -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) */ diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h index e25259f39fa8..4e5a2ef82ecd 100644 --- a/compat/compat-2.6.28.h +++ b/compat/compat-2.6.28.h @@ -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 -- 2.30.2