From 6f0cf734b4a7afc08daf079b68ff38ccbc219f64 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 3 Jul 2009 08:44:01 -0500 Subject: [PATCH] smp: processor id fixups for rt commit 5f6b01fb42386d9f33b2a759e59551d923a976ee in tip. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- include/linux/netpoll.h | 2 +- kernel/workqueue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index a765ea8..ffc738c 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -89,7 +89,7 @@ static inline void *netpoll_poll_lock(struct napi_struct *napi) rcu_read_lock(); /* deal with race on ->npinfo */ if (dev && dev->npinfo) { spin_lock(&napi->poll_lock); - napi->poll_owner = smp_processor_id(); + napi->poll_owner = raw_smp_processor_id(); return napi; } return NULL; diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 9f2f34d..abc7af1 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -317,7 +317,7 @@ static void delayed_work_timer_fn(unsigned long __data) struct cpu_workqueue_struct *cwq = get_wq_data(&dwork->work); struct workqueue_struct *wq = cwq->wq; - __queue_work(wq_per_cpu(wq, smp_processor_id()), &dwork->work); + __queue_work(wq_per_cpu(wq, raw_smp_processor_id()), &dwork->work); } /** -- 1.7.0.4