linux.git/drivers/tty/vt/keyboard.c, branch v3.5

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-23T18:16:40+00:00

Pull x86 platform changes from Ingo Molnar:
 "This tree includes assorted platform driver updates and a preparatory
  series for a platform with custom DMA remapping semantics (sta2x11 I/O
  hub)."

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vsmp: Fix number of CPUs when vsmp is disabled
  keyboard: Use BIOS Keyboard variable to set Numlock
  x86/olpc/xo1/sci: Report RTC wakeup events
  x86/olpc/xo1/sci: Produce wakeup events for buttons and switches
  x86, platform: Initial support for sta2x11 I/O hub
  x86: Introduce CONFIG_X86_DMA_REMAP
  x86-32: Introduce CONFIG_X86_DEV_DMA_OPS

tty: Fix LED error return

2012-05-14T17:43:24+00:00

3.4-rc introduced a regression when setting the LEDS. We do the right thing
but then return an error code.

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=43144
Reported-by: Christian Casteyde
Signed-off-by: Alan Cox 
Signed-off-by: Linus Torvalds

keyboard: Use BIOS Keyboard variable to set Numlock

2012-05-08T21:19:41+00:00

The PC BIOS does provide a NUMLOCK flag containing the desired state
of this LED. This patch sets the current state according to the data
in the bios.

[ hpa: fixed __weak declaration without definition, changed "inline"
  to "static inline" ]

Signed-Off-By: Joshua Cov 
Link: http://lkml.kernel.org/r/CAKL7Q7rvq87TNS1T_Km8fW_5OzS%2BSbYazLXKxW-6ztOxo3zorg@mail.gmail.com
Acked-by: Alan Cox 
Signed-off-by: H. Peter Anvin

vt: Fix deadlock on scroll-lock

2012-05-01T18:01:28+00:00

Fixing the locking accidentally replaced a race in the scroll
lock handling with a deadlock. Turn it back into a race for
now.

The basic problem is that there are two paths into the tty
stop/start helpers. One via the tty layer ^S/^Q handling
where we need to take the kbd_event_lock and one via the
special keyboard handler for fn_hold where we already hold
it. Probably we need to split out into a separate LED lock
but for now just go back to the race as it's a bit close
to release.

Reported-by: Clemens Ladisch 
Cc: Jiri Kosina 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

vt: NULL dereference in vt_do_kdsk_ioctl()

2012-03-12T17:21:55+00:00

We forgot to set the "key_map" variable here, so it's still NULL.  This
was introduced recently in 079c9534a9 "vt:tackle kbd_table".

Signed-off-by: Dan Carpenter 
Signed-off-by: Jiri Slaby 
Acked-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

vt:tackle kbd_table

2012-03-08T18:50:35+00:00

Keyboard struct lifetime is easy, but the locking is not and is completely
ignored by the existing code. Tackle this one head on

- Make the kbd_table private so we can run down all direct users
- Hoick the relevant ioctl handlers into the keyboard layer
- Lock them with the keyboard lock so they don't change mid keypress
- Add helpers for things like console stop/start so we isolate the poking
  around properly
- Tweak the braille console so it still builds

There are a couple of FIXME locking cases left for ioctls that are so hideous
they should be addressed in a later patch. After this patch the kbd_table is
private and all the keyboard jiggery pokery is in one place.

This update fixes speakup and also a memory leak in the original.

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

tty: keyboard.c: add uaccess.h to fix a build problem on sparc32

2012-02-27T23:18:56+00:00

Reported-by: Stephen Rothwell 
Cc: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

vt: tidy a few bits of checkpatch noise

2012-02-24T21:59:35+00:00

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

vt: lock the accent table

2012-02-24T21:59:34+00:00

First step to debletcherising the vt console layer - pick a victim and fix
the locking

This is a nice simple object with its own rules so lets pick it out for
treatment. The user of the table already has a lock so we will also use the
same lock for updates.

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

keyboard: Do not include

2011-09-22T23:05:08+00:00

The top of  has this comment:

 * Please do not include this file in generic code.  There is currently
 * no requirement for any architecture to implement anything held
 * within this file.
 *
 * Thanks. --rmk

Remove inclusion of , to prevent the following compile error
from happening soon:

| include/linux/irq.h:132: error: redefinition of ‘struct irq_data’
| include/linux/irq.h:286: error: redefinition of ‘struct irq_chip’

drivers/tty/vt/keyboard.c needs to include  for get_irq_regs():

| drivers/tty/vt/keyboard.c:497: error: implicit declaration of function ‘get_irq_regs’
| drivers/tty/vt/keyboard.c:497: warning: initialization makes pointer from integer without a cast

Signed-off-by: Geert Uytterhoeven 
Acked-by: Thomas Gleixner 
Cc: Greg Kroah-Hartman 
Signed-off-by: Greg Kroah-Hartman