git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
cputime.h
diff --git
a/arch/s390/include/asm/cputime.h
b/arch/s390/include/asm/cputime.h
index
40e2ab0
..
0814348
100644
(file)
--- a/
arch/s390/include/asm/cputime.h
+++ b/
arch/s390/include/asm/cputime.h
@@
-202,7
+202,7
@@
static inline void s390_idle_check(struct pt_regs *regs, __u64 int_clock,
static inline int s390_nohz_delay(int cpu)
{
- return
per_cpu(s390_idle, cpu
).nohz_delay != 0;
+ return
__get_cpu_var(s390_idle
).nohz_delay != 0;
}
#define arch_needs_cpu(cpu) s390_nohz_delay(cpu)