[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20070426.201829.110908085.davem@davemloft.net>
Date: Thu, 26 Apr 2007 20:18:29 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: dhowells@...hat.com
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH 00/14] AF_RXRPC socket family and AFS rewrite [net-2.6]
From: David Miller <davem@...emloft.net>
Date: Thu, 26 Apr 2007 20:12:13 -0700 (PDT)
> In file included from net/rxrpc/rxkad.c:21:
> net/rxrpc/ar-internal.h:803:1: warning: "atomic_dec" redefined
> In file included from include/linux/spinlock.h:326,
> from include/linux/module.h:9,
> from net/rxrpc/rxkad.c:12:
> include/asm/atomic.h:67:1: warning: this is the location of the previous definition
I'm fixing this as follows, if you want this debugging code
back do it properly, thanks.
commit 411faf5810cdd0e4f5071a3805d8adb49d120a07
Author: David S. Miller <davem@...set.davemloft.net>
Date: Thu Apr 26 20:18:17 2007 -0700
[RXRPC]: Remove bogus atomic_* overrides.
These are done with CPP defines which several platforms
use for their atomic.h implementation, which floods the
build with warnings and breaks the build.
Signed-off-by: David S. Miller <davem@...emloft.net>
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index cb1eb49..58aaf89 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -786,30 +786,6 @@ static inline void rxrpc_purge_queue(struct sk_buff_head *list)
rxrpc_free_skb(skb);
}
-static inline void __rxrpc__atomic_inc(atomic_t *v)
-{
- CHECK_SLAB_OKAY(v);
- atomic_inc(v);
-}
-
-#define atomic_inc(v) __rxrpc__atomic_inc((v))
-
-static inline void __rxrpc__atomic_dec(atomic_t *v)
-{
- CHECK_SLAB_OKAY(v);
- atomic_dec(v);
-}
-
-#define atomic_dec(v) __rxrpc__atomic_dec((v))
-
-static inline int __rxrpc__atomic_dec_and_test(atomic_t *v)
-{
- CHECK_SLAB_OKAY(v);
- return atomic_dec_and_test(v);
-}
-
-#define atomic_dec_and_test(v) __rxrpc__atomic_dec_and_test((v))
-
static inline void __rxrpc_get_local(struct rxrpc_local *local, const char *f)
{
CHECK_SLAB_OKAY(&local->usage);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists