diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 11:59:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 11:59:39 +1100 |
| commit | b34c69f930a9a4a45f44f6c40926f99dfe623f4c (patch) | |
| tree | 5ce4e3e8bcb3887c1c004f2e70d29bc918ff420f /drivers/staging | |
| parent | 86316b8404a1d62a20a9ef4ecec5135c3f2b8dda (diff) | |
| parent | b924047fe07689ed9b7f0a8e14826534caaff8fc (diff) | |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/speakup/fakekey.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/speakup/fakekey.c b/drivers/staging/speakup/fakekey.c index 65b231178f05..1b34a8771641 100644 --- a/drivers/staging/speakup/fakekey.c +++ b/drivers/staging/speakup/fakekey.c @@ -78,10 +78,10 @@ void speakup_fake_down_arrow(void) /* don't change CPU */ preempt_disable(); - __get_cpu_var(reporting_keystroke) = true; + __this_cpu_write(reporting_keystroke, true); input_report_key(virt_keyboard, KEY_DOWN, PRESSED); input_report_key(virt_keyboard, KEY_DOWN, RELEASED); - __get_cpu_var(reporting_keystroke) = false; + __this_cpu_write(reporting_keystroke, false); /* reenable preemption */ preempt_enable(); @@ -95,10 +95,5 @@ void speakup_fake_down_arrow(void) */ bool speakup_fake_key_pressed(void) { - bool is_pressed; - - is_pressed = get_cpu_var(reporting_keystroke); - put_cpu_var(reporting_keystroke); - - return is_pressed; + return this_cpu_read(reporting_keystroke); } |