Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1051-2.6.25-xen-Disable-early_printk-by-default.patch

    Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1051-2.6.25-xen-Disable-early_printk-by-default.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 606 - (hide annotations) (download)
    Thu May 22 23:13:13 2008 UTC (16 years, 4 months ago) by niro
    File size: 1186 byte(s) 
    -ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2
    1 niro 606 From fd534ffd75350b7f812001b003f060918edcd279 Mon Sep 17 00:00:00 2001
    2     From: Eduardo Habkost <ehabkost@redhat.com>
    3     Date: Wed, 5 Dec 2007 17:21:53 -0200
    4     Subject: [PATCH] Disable early_printk() by default
    5    
    6     Temporary until a better solution for automatically skipping the VGA
    7     console is found.
    8    
    9     Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    10     ---
    11     arch/x86/kernel/early_printk.c | 5 +++--
    12     1 files changed, 3 insertions(+), 2 deletions(-)
    13    
    14     diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
    15     index cff84cd..4c70cc4 100644
    16     --- a/arch/x86/kernel/early_printk.c
    17     +++ b/arch/x86/kernel/early_printk.c
    18     @@ -193,7 +193,7 @@ static struct console simnow_console = {
    19     };
    20    
    21     /* Direct interface for emergencies */
    22     -static struct console *early_console = &early_vga_console;
    23     +static struct console *early_console;
    24     static int early_console_initialized = 0;
    25    
    26     void early_printk(const char *fmt, ...)
    27     @@ -204,7 +204,8 @@ void early_printk(const char *fmt, ...)
    28    
    29     va_start(ap,fmt);
    30     n = vscnprintf(buf,512,fmt,ap);
    31     - early_console->write(early_console,buf,n);
    32     + if (likely(early_console))
    33     + early_console->write(early_console,buf,n);
    34     va_end(ap);
    35     }
    36    
    37     --
    38     1.5.4.1
    39