lkml.org 
[lkml]   [2007]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/2] mca: mca_pentium_flag no longer used
    Thanks James, hopefully have the mailer fixed now. 


    The check for mca_pentium_flag was removed long ago.
    This cleans up the flag and documentation.

    Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>

    diff -uprN -X dontdiff linux-2.6.21-vanilla/arch/i386/kernel/setup.c linux-2.6.21/arch/i386/kernel/setup.c
    --- linux-2.6.21-vanilla/arch/i386/kernel/setup.c 2007-05-06 10:27:39.000000000 +1000
    +++ linux-2.6.21/arch/i386/kernel/setup.c 2007-05-06 11:35:03.000000000 +1000
    @@ -91,7 +91,6 @@ EXPORT_SYMBOL(machine_id);
    #endif
    unsigned int machine_submodel_id;
    unsigned int BIOS_revision;
    -unsigned int mca_pentium_flag;

    /* Boot loader ID as an integer, for the benefit of proc_dointvec */
    int bootloader_type;
    diff -uprN -X dontdiff linux-2.6.21-vanilla/Documentation/kernel-parameters.txt linux-2.6.21/Documentation/kernel-parameters.txt
    --- linux-2.6.21-vanilla/Documentation/kernel-parameters.txt 2007-05-06 10:27:37.000000000 +1000
    +++ linux-2.6.21/Documentation/kernel-parameters.txt 2007-05-06 11:39:27.000000000 +1000
    @@ -894,8 +894,6 @@ and is between 256 and 4096 characters.
    [SCSI] Maximum number of LUNs received.
    Should be between 1 and 16384.

    - mca-pentium [BUGS=IA-32]
    -
    mcatest= [IA-64]

    mcd= [HW,CD]
    diff -uprN -X dontdiff linux-2.6.21-vanilla/include/asm-i386/bugs.h linux-2.6.21/include/asm-i386/bugs.h
    --- linux-2.6.21-vanilla/include/asm-i386/bugs.h 2007-05-06 10:31:04.000000000 +1000
    +++ linux-2.6.21/include/asm-i386/bugs.h 2007-05-06 11:35:39.000000000 +1000
    @@ -31,14 +31,6 @@ static int __init no_halt(char *s)

    __setup("no-hlt", no_halt);

    -static int __init mca_pentium(char *s)
    -{
    - mca_pentium_flag = 1;
    - return 1;
    -}
    -
    -__setup("mca-pentium", mca_pentium);
    -
    static int __init no_387(char *s)
    {
    boot_cpu_data.hard_math = 0;
    diff -uprN -X dontdiff linux-2.6.21-vanilla/include/asm-i386/processor.h linux-2.6.21/include/asm-i386/processor.h
    --- linux-2.6.21-vanilla/include/asm-i386/processor.h 2007-05-06 10:31:05.000000000 +1000
    +++ linux-2.6.21/include/asm-i386/processor.h 2007-05-06 11:35:19.000000000 +1000
    @@ -264,7 +264,6 @@ others may find it useful. */
    extern unsigned int machine_id;
    extern unsigned int machine_submodel_id;
    extern unsigned int BIOS_revision;
    -extern unsigned int mca_pentium_flag;

    /* Boot loader type from the setup header */
    extern int bootloader_type;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-05-13 14:13    [W:0.023 / U:0.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site