Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=08cd93f9e11ac8c3e42c72debe7dc55a761149c2
Commit:     08cd93f9e11ac8c3e42c72debe7dc55a761149c2
Parent:     9a4c8546f3e7c893888bccc2b3416d6214f2664a
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 14 23:23:37 2008 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Feb 19 16:18:28 2008 +0100

    remove mca-pentium
    
    This patch removes the mca-pentium boot option that was a noop.
    
    besides the source code cleanup factor, this saves some text as well:
    
       arch/x86/kernel/cpu/bugs.o:
          text    data     bss     dec     hex filename
           651      77       4     732     2dc bugs.o.before
           631      53       4     688     2b0 bugs.o.after
    
    Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 Documentation/kernel-parameters.txt |    2 --
 arch/x86/kernel/cpu/bugs.c          |    8 --------
 arch/x86/kernel/setup_32.c          |    1 -
 include/asm-x86/processor.h         |    1 -
 4 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/Documentation/kernel-parameters.txt 
b/Documentation/kernel-parameters.txt
index a4fc7fc..7278295 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1056,8 +1056,6 @@ and is between 256 and 4096 characters. It is defined in 
the file
                        [SCSI] Maximum number of LUNs received.
                        Should be between 1 and 16384.
 
-       mca-pentium     [BUGS=X86-32]
-
        mcatest=        [IA-64]
 
        mce             [X86-32] Machine Check Exception
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 9b95edc..027e5c0 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -25,14 +25,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 --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 691ab4c..a1d7071 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -164,7 +164,6 @@ unsigned long mmu_cr4_features = X86_CR4_PAE;
 unsigned int machine_id;
 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 --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 149920d..7b1ca1f 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -671,7 +671,6 @@ extern void init_gdt(int cpu);
 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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to