projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-block.git]
/
kernel
/
sched
/
sched.h
diff --git
a/kernel/sched/sched.h
b/kernel/sched/sched.h
index 6130251de28013a06dd9ce1aeb076a6a7b86c7c3..24156c8434d1ebbe679a3fa6df45725aa7db3647 100644
(file)
--- a/
kernel/sched/sched.h
+++ b/
kernel/sched/sched.h
@@
-663,10
+663,10
@@
static inline int cpu_of(struct rq *rq)
DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
#define cpu_rq(cpu) (&per_cpu(runqueues, (cpu)))
DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
#define cpu_rq(cpu) (&per_cpu(runqueues, (cpu)))
-#define this_rq()
(&__get_cpu_var(runqueues)
)
+#define this_rq()
this_cpu_ptr(&runqueues
)
#define task_rq(p) cpu_rq(task_cpu(p))
#define cpu_curr(cpu) (cpu_rq(cpu)->curr)
#define task_rq(p) cpu_rq(task_cpu(p))
#define cpu_curr(cpu) (cpu_rq(cpu)->curr)
-#define raw_rq()
(&__raw_get_cpu_var(runqueues)
)
+#define raw_rq()
raw_cpu_ptr(&runqueues
)
static inline u64 rq_clock(struct rq *rq)
{
static inline u64 rq_clock(struct rq *rq)
{