2002-12-03 05:47:34

by Hiroshi Miura

[permalink] [raw]
Subject: [PATCH] 2.5.50 NatSemi Geode (clean up)

Hello,

in 2.5.50, dodgy_tsc() in arch/i386/kernel/cpu/common.c is never used.
That's because the workaround for a NatSemi Geode / Cyrix MediaGX has already
merged.

This patch clean dodgy_tsc().

diff -urN -X kernel-patches/dontdiff linux-2.5.50/arch/i386/kernel/cpu/common.c linux-2.5.50-geode/arch/i386/kernel/cpu/common.c
--- linux-2.5.50/arch/i386/kernel/cpu/common.c 2002-12-03 07:58:40.000000000 +0900
+++ linux-2.5.50-geode/arch/i386/kernel/cpu/common.c 2002-12-03 11:11:56.000000000 +0900
@@ -362,17 +362,6 @@
mcheck_init(c);
#endif
}
-/*
- * Perform early boot up checks for a valid TSC. See arch/i386/kernel/time.c
- */
-
-void __init dodgy_tsc(void)
-{
- get_cpu_vendor(&boot_cpu_data);
- if (( boot_cpu_data.x86_vendor == X86_VENDOR_CYRIX ) ||
- ( boot_cpu_data.x86_vendor == X86_VENDOR_NSC ))
- cpu_devs[X86_VENDOR_CYRIX]->c_init(&boot_cpu_data);
-}

void __init print_cpu_info(struct cpuinfo_x86 *c)
{
diff -urN -X kernel-patches/dontdiff linux-2.5.50/include/asm-i386/processor.h linux-2.5.50-geode/include/asm-i386/processor.h
--- linux-2.5.50/include/asm-i386/processor.h 2002-12-03 08:01:25.000000000 +0900
+++ linux-2.5.50-geode/include/asm-i386/processor.h 2002-12-03 11:12:16.000000000 +0900
@@ -91,7 +91,6 @@

extern void identify_cpu(struct cpuinfo_x86 *);
extern void print_cpu_info(struct cpuinfo_x86 *);
-extern void dodgy_tsc(void);

/*
* EFLAGS bits
diff -urN -X kernel-patches/dontdiff linux-2.5.50/include/asm-x86_64/processor.h linux-2.5.50-geode/include/asm-x86_64/processor.h
--- linux-2.5.50/include/asm-x86_64/processor.h 2002-12-03 07:57:28.000000000 +0900
+++ linux-2.5.50-geode/include/asm-x86_64/processor.h 2002-12-03 11:12:42.000000000 +0900
@@ -85,7 +85,6 @@

extern void identify_cpu(struct cpuinfo_x86 *);
extern void print_cpu_info(struct cpuinfo_x86 *);
-extern void dodgy_tsc(void);

/*
* EFLAGS bits



--
Hiroshi Miura --- http://www.da-cha.org/
NTTDATA Corp. Marketing & Business Strategy Planning Dept. --- [email protected]
Key fingerprint = 9117 9407 5684 FBF1 4063 15B4 401D D077 04AB 8617
-- My hacking life is happy as the day is long