projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
input
/
gameport
/
gameport.c
diff --git
a/drivers/input/gameport/gameport.c
b/drivers/input/gameport/gameport.c
index
dbf741c
..
23cf8fc
100644
(file)
--- a/
drivers/input/gameport/gameport.c
+++ b/
drivers/input/gameport/gameport.c
@@
-121,7
+121,7
@@
static int gameport_measure_speed(struct gameport *gameport)
}
gameport_close(gameport);
- return (
cpu_data(raw_smp_processor_id()).loops_per_jiffy
*
+ return (
this_cpu_read(cpu_info.loops_per_jiffy)
*
(unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
#else