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

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  vgacon: Add support for setting the default cursor state
  vc: Add support for hiding the cursor when creating VTs
  x86, setup: Store the boot cursor state

1 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 495a39a77341..777dc8a32df8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2747,6 +2747,15 @@ and is between 256 and 4096 characters. It is defined in the file
                         Default is 1, i.e. UTF-8 mode is enabled for all
                         newly opened terminals.
 
+        vt.global_cursor_default=
+                        [VT]
+                        Format=<-1|0|1>
+                        Set system-wide default for whether a cursor
+                        is shown on new VTs. Default is -1,
+                        i.e. cursors will be created by default unless
+                        overridden by individual drivers. 0 will hide
+                        cursors, 1 will display them.
+
         waveartist=     [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>