ChangeSet 1.2199.8.30, 2005/03/22 19:04:16-08:00, [EMAIL PROTECTED]
[NETPOLL]: Do not use __smp_processor_id().
It is not necessarily available in all configurations.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
include/linux/netpoll.h | 2 +-
net/core/netpoll.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff -Nru a/include/linux/netpoll.h b/include/linux/netpoll.h
--- a/include/linux/netpoll.h 2005-03-26 17:16:34 -08:00
+++ b/include/linux/netpoll.h 2005-03-26 17:16:34 -08:00
@@ -46,7 +46,7 @@
{
if (dev->np) {
spin_lock(&dev->np->poll_lock);
- dev->np->poll_owner = __smp_processor_id();
+ dev->np->poll_owner = smp_processor_id();
}
}
diff -Nru a/net/core/netpoll.c b/net/core/netpoll.c
--- a/net/core/netpoll.c 2005-03-26 17:16:34 -08:00
+++ b/net/core/netpoll.c 2005-03-26 17:16:34 -08:00
@@ -133,7 +133,7 @@
int budget = 16;
if (test_bit(__LINK_STATE_RX_SCHED, &np->dev->state) &&
- np->poll_owner != __smp_processor_id() &&
+ np->poll_owner != smp_processor_id() &&
spin_trylock(&np->poll_lock)) {
np->rx_flags |= NETPOLL_RX_DROP;
atomic_inc(&trapped);
@@ -252,8 +252,8 @@
}
/* avoid recursion */
- if(np->poll_owner == __smp_processor_id() ||
- np->dev->xmit_lock_owner == __smp_processor_id()) {
+ if(np->poll_owner == smp_processor_id() ||
+ np->dev->xmit_lock_owner == smp_processor_id()) {
if (np->drop)
np->drop(skb);
else
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
