Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Tue, 3 Dec 2002 00:47:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Tue, 3 Dec 2002 00:47:34 -0500 Received: from ylug.mozilla.gr.jp ([203.141.142.92]:12302 "HELO maison.kyo-ko.org") by vger.kernel.org with SMTP id ; Tue, 3 Dec 2002 00:47:32 -0500 X-Mailer: cmail 2.61.1+20011011 on GNU Emacs 20.7.2 / Mule 4.1 =?ISO-2022-JP?B?KBskQjAqGyhCKQ==?= From: Hiroshi Miura To: davej@suse.de, hpa@zytor.com, linux-kernel@vger.kernel.org Cc: miura@da-cha.org Subject: [PATCH] 2.5.50 NatSemi Geode (clean up) X-Face: "7/]{D;9O-#dR'kB\tvpz_:#o|*UdC.KK/_"IN*i5VTU&EBhS6w68xQDPh]i4N%1byZ~v~X k$vdp(%V@gY!_|7x7Ht)^ih5\%\l'hcl$`sqp;%`boxPHDJB<~Sr8(e:zPKmeZ)ZPml[0v\|[V00Jm G,%5V5X9Mw7j}(8+!o>&&wmQ]Xh=j User-Agent: SEMI/1.14.4 (=?ISO-2022-JP?B?GyRCOllPJExaGyhC?=) FLIM/1.14.4 (=?ISO-2022-JP?B?GyRCM2A4Nj9ANVxBMBsoQg==?=) APEL/10.4 Emacs/20.7 (i386-debian-linux-gnu) MULE/4.1 (=?ISO-2022-JP?B?GyRCMCobKEI=?=) MIME-Version: 1.0 (generated by SEMI 1.14.4 - =?ISO-2022-JP?B?IhskQjpZGyhC?= =?ISO-2022-JP?B?GyRCTyRMWhsoQiI=?=) Content-Type: text/plain; charset=US-ASCII Message-Id: <20021203051903.DE0311178DA@triton2> Date: Tue, 3 Dec 2002 14:19:03 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2378 Lines: 65 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. --- miurahr@nttdata.co.jp Key fingerprint = 9117 9407 5684 FBF1 4063 15B4 401D D077 04AB 8617 -- My hacking life is happy as the day is long - 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/