Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:25 +0000 (14:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:25 +0000 (14:44 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: serio/gameport - use 'long' system workqueue
  Input: synaptics - document 0x0c query
  Input: tegra-kbc - add function keymap

1  2 
drivers/input/gameport/gameport.c

@@@ -121,7 -121,7 +121,7 @@@ static int gameport_measure_speed(struc
        }
  
        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
@@@ -360,7 -360,7 +360,7 @@@ static int gameport_queue_event(void *o
        event->owner = owner;
  
        list_add_tail(&event->node, &gameport_event_list);
-       schedule_work(&gameport_event_work);
+       queue_work(system_long_wq, &gameport_event_work);
  
  out:
        spin_unlock_irqrestore(&gameport_event_lock, flags);