litmus-rt.git/drivers/video/console, branch linux-tip

BKL: remove extraneous #include

2010-11-17T16:59:32+00:00

The big kernel lock has been removed from all these files at some point,
leaving only the #include.

Remove this too as a cleanup.

Signed-off-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

fbcon: fix lockdep warning from fbcon_deinit()

2010-09-23T00:22:39+00:00

Fix the lockdep warning:

[   13.657164] INFO: trying to register non-static key.
[   13.657169] the code is fine but needs lockdep annotation.
[   13.657171] turning off the locking correctness validator.
[   13.657177] Pid: 622, comm: modprobe Not tainted 2.6.36-rc3c #8
[   13.657180] Call Trace:
[   13.657194]  [] ? printk+0x18/0x20
[   13.657202]  [] register_lock_class+0x336/0x350
[   13.657208]  [] __lock_acquire+0x449/0x1180
[   13.657215]  [] lock_acquire+0x67/0x80
[   13.657222]  [] ? __cancel_work_timer+0x51/0x230
[   13.657227]  [] __cancel_work_timer+0x83/0x230
[   13.657231]  [] ? __cancel_work_timer+0x51/0x230
[   13.657236]  [] ? mark_held_locks+0x62/0x80
[   13.657243]  [] ? kfree+0x7f/0xe0
[   13.657248]  [] ? trace_hardirqs_on_caller+0x11c/0x160
[   13.657253]  [] ? trace_hardirqs_on+0xb/0x10
[   13.657259]  [] ? fbcon_deinit+0x16d/0x1e0
[   13.657263]  [] ? fbcon_deinit+0x16d/0x1e0
[   13.657268]  [] cancel_work_sync+0xa/0x10
[   13.657272]  [] fbcon_deinit+0xe4/0x1e0
...

The warning is caused by trying to cancel an uninitialized work from
fbcon_exit().  Fix it by adding a check for queue.func, similarly to other
places in this code.

Signed-off-by: Jarek Poplawski 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

fbcon: uninline four foo_update_attr() functions

2010-08-11T15:59:09+00:00

This patch uninlines four similar functions, foo_update_attr(), in four
fbcon-related files.

These functions contain loops, two of theam have _nested_ loops, and they
have more than one callsite each.  I think they should not be inlined.

Signed-off-by: Denys Vlasenko 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

fbcon: uninline large static function get_color()

2010-08-11T15:59:09+00:00

This function's body is good two screenfuls and it has six callsites.  No
apparent reason why it is marked inline.

Signed-off-by: Denys Vlasenko 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

tty: fix console_sem lock order

2010-08-10T20:47:43+00:00

vgacon_do_font_op releases and reacquires the BTM while holding
console_sem. This violates the rule that BTM has to be the
outer lock whenever we hold both.

There does not seem to be any reason to give up the BTM here,
so just stop doing that.

Signed-off-by: Arnd Bergmann 
Cc: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

tty: replace BKL with a new tty_lock

2010-08-10T20:47:43+00:00

As a preparation for replacing the big kernel lock
in the TTY layer, wrap all the callers in new
macros tty_lock, tty_lock_nested and tty_unlock.

Signed-off-by: Arnd Bergmann 
Cc: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

vt/console: try harder to print output when panicing

2010-08-10T20:47:40+00:00

Jesse's initial patch commit said:

"At panic time (i.e.  when oops_in_progress is set) we should try a bit
harder to update the screen and make sure output gets to the VT, since
some drivers are capable of flipping back to it.

So make sure we try to unblank and update the display if called from a
panic context."

I've enhanced this to add a flag to the vc that console layer can set to
indicate they want this behaviour to occur.  This also adds support to
fbcon for that flag and adds an fb flag for drivers to indicate they want
to use the support.  It enables this for KMS drivers.

Signed-off-by: Dave Airlie 
Signed-off-by: Jesse Barnes 
Acked-by: James Simmons 
Cc: Alan Cox 
Signed-off-by: Andrew Morton 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-08-08T17:01:46+00:00

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (143 commits)
  omap: mailbox: reorganize headers
  omap: mailbox: standarize on 'omap-mailbox'
  omap: mailbox: only compile for configured archs
  omap: mailbox: simplify omap_mbox_register()
  omap: mailbox: reorganize registering
  omap: mailbox: add IRQ names
  omap: mailbox: remove unecessary fields
  omap: mailbox: don't export unecessary symbols
  omap: mailbox: update omap1 probing
  omap: mailbox: use correct config for omap1
  omap: mailbox: 2420 should be detected at run-time
  omap: mailbox: reorganize structures
  omap: mailbox: trivial cleanups
  omap mailbox: Set a device in logical mbox instance for traceability
  omap: mailbox: convert block api to kfifo
  omap: mailbox: remove (un)likely macros from cold paths
  omap: mailbox cleanup: split MODULE_AUTHOR line
  omap: mailbox: convert rwlocks to spinlock
  Mailbox: disable mailbox interrupt when request queue
  Mailbox: new mutext lock for h/w mailbox configuration
  ...

fb: add hooks to handle KDB enter/exit

2010-08-05T14:22:31+00:00

Add fb ops to handle enter/exit of the kernel debugger.  If present, the
fb core will register them with KGDB and they'll be called when the
debugger is entered and exited.  The new functions are responsible for
switching to an appropriate debug framebuffer and restoring the
interrupted state at exit time.

Signed-off-by: Jesse Barnes 
Signed-off-by: Jason Wessel

ARM: Disable VGA console for ARM in most cases

2010-07-05T13:31:46+00:00

Otherwise we have to disable it manually to avoid compile errors.

Now it's only enabled only for the selected machines as suggested
by Anton Vorontsov :

$ git grep VGA_CONSOLE= arch/arm/configs/
arch/arm/configs/footbridge_defconfig:CONFIG_VGA_CONSOLE=y
arch/arm/configs/integrator_defconfig:CONFIG_VGA_CONSOLE=y
arch/arm/configs/netwinder_defconfig:CONFIG_VGA_CONSOLE=y

Note that the Kconfig entry no longer needs separate entries
for ARCH_ACORN, ARCH_EBSA110 ARCH_VERSATILE.

Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Tony Lindgren