This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Mon Jun 10 15:07:30 2024 Received: from entropy.muc.muohio.edu (IDENT:root@entropy.muc.muohio.edu [134.53.213.10]) by herbie.ucs.indiana.edu (8.9.3/8.9.3) with ESMTP id HAA20284 for ; Thu, 1 Jul 1999 07:44:28 -0500 (EST) Received: from vger.rutgers.edu (vger.rutgers.edu [128.6.190.2]) by entropy.muc.muohio.edu (8.8.7/8.8.7) with ESMTP id IAA22460; Thu, 1 Jul 1999 08:38:33 -0400 Received: by vger.rutgers.edu via listexpand id ; Thu, 1 Jul 1999 08:36:38 -0400 Received: by vger.rutgers.edu id ; Thu, 1 Jul 1999 08:36:21 -0400 Received: from indyio.rz.uni-sb.de ([134.96.7.3]:31404 "EHLO indyio.rz.uni-sb.de") by vger.rutgers.edu with ESMTP id ; Thu, 1 Jul 1999 08:33:49 -0400 Received: from sbustd.stud.uni-sb.de (IDENT:9yuJaTapfaf8FyNJpc8Cqc+5pPFEMHVh@eris.rz.uni-sb.de [134.96.7.8]) by indyio.rz.uni-sb.de (8.9.3/8.9.3) with ESMTP id OAA1291396; Thu, 1 Jul 1999 14:33:01 +0200 (CST) Received: from colorfullife.com (IDENT:manfreds@acc3-39.telip.uni-sb.de [134.96.127.39]) by sbustd.stud.uni-sb.de (8.9.3/8.9.3) with ESMTP id OAA15005; Thu, 1 Jul 1999 14:32:53 +0200 (CST) Message-Id: <377B5F70.A33A3EED@colorfullife.com> Date: Thu, 01 Jul 1999 14:30:40 +0200 From: Manfred Spraul Reply-To: masp0008@stud.uni-sb.de X-Mailer: Mozilla 4.51 [en] (X11; I; Linux 2.2.10 i686) X-Accept-Language: en Mime-Version: 1.0 To: linux-kernel@vger.rutgers.edu, Linus Torvalds Subject: [miniPATCH] remove initialize_secondary from init/main.c Content-Type: multipart/mixed; boundary="------------C865B2303630D6B780C969CC" Sender: owner-linux-kernel@vger.rutgers.edu Precedence: bulk X-Loop: majordomo@vger.rutgers.edu X-Orcpt: rfc822;linux-kernel-outgoing-dig This is a multi-part message in MIME format. --------------C865B2303630D6B780C969CC Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit initialize_secondary() is only used on the x86 platform. This patch moves initialize_secondary() into arch/i386/kernel and removes all references from all other architectures. --------------C865B2303630D6B780C969CC Content-Type: text/plain; charset=us-ascii; name="patch-SMPCLEANUP" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-SMPCLEANUP" // $Header: /pub/cvs/ms/patches/patch-SMPCLEANUP,v 1.5 1999/07/01 12:31:27 manfreds Exp $ // Kernel Version: // VERSION = 2 // PATCHLEVEL = 3 // SUBLEVEL = 9 // EXTRAVERSION = diff -r -u -P -x CVS -x *,v 2.3/arch/alpha/kernel/smp.c build-2.3/arch/alpha/kernel/smp.c --- 2.3/arch/alpha/kernel/smp.c Sat Jun 26 11:52:55 1999 +++ build-2.3/arch/alpha/kernel/smp.c Thu Jul 1 14:12:39 1999 @@ -567,17 +567,6 @@ mb(); } -/* - * Only broken Intel needs this, thus it should not even be - * referenced globally. - */ - -void __init -initialize_secondary(void) -{ -} - - extern void update_one_process(struct task_struct *p, unsigned long ticks, unsigned long user, unsigned long system, int cpu); diff -r -u -P -x CVS -x *,v 2.3/arch/i386/kernel/head.S build-2.3/arch/i386/kernel/head.S --- 2.3/arch/i386/kernel/head.S Wed Jun 2 18:19:20 1999 +++ build-2.3/arch/i386/kernel/head.S Thu Jul 1 14:12:39 1999 @@ -242,6 +242,14 @@ xorl %eax,%eax lldt %ax cld # gcc2 wants the direction flag cleared at all times +#ifdef __SMP__ + movb ready, %cl + cmpb $1,%cl + je 1f + call SYMBOL_NAME(initialize_secondary) + jmp L6 +1: +#endif call SYMBOL_NAME(start_kernel) L6: jmp L6 # main should never return here, but diff -r -u -P -x CVS -x *,v 2.3/arch/ppc/kernel/smp.c build-2.3/arch/ppc/kernel/smp.c --- 2.3/arch/ppc/kernel/smp.c Thu Jul 1 14:11:39 1999 +++ build-2.3/arch/ppc/kernel/smp.c Thu Jul 1 14:12:39 1999 @@ -383,11 +383,6 @@ smp_commenced = 1; } -/* intel needs this */ -void __init initialize_secondary(void) -{ -} - /* Activate a secondary processor. */ asmlinkage int __init start_secondary(void *unused) { diff -r -u -P -x CVS -x *,v 2.3/arch/sparc/kernel/smp.c build-2.3/arch/sparc/kernel/smp.c --- 2.3/arch/sparc/kernel/smp.c Wed Jun 2 18:19:20 1999 +++ build-2.3/arch/sparc/kernel/smp.c Thu Jul 1 14:12:39 1999 @@ -100,13 +100,6 @@ local_flush_tlb_all(); } -/* Only broken Intel needs this, thus it should not even be referenced - * globally... - */ -__initfunc(void initialize_secondary(void)) -{ -} - extern int cpu_idle(void *unused); /* Activate a secondary processor. */ diff -r -u -P -x CVS -x *,v 2.3/arch/sparc64/kernel/smp.c build-2.3/arch/sparc64/kernel/smp.c --- 2.3/arch/sparc64/kernel/smp.c Wed Jun 2 18:19:20 1999 +++ build-2.3/arch/sparc64/kernel/smp.c Thu Jul 1 14:12:39 1999 @@ -160,10 +160,6 @@ extern int cpu_idle(void *unused); extern void init_IRQ(void); -void initialize_secondary(void) -{ -} - int start_secondary(void *unused) { trap_init(); diff -r -u -P -x CVS -x *,v 2.3/init/main.c build-2.3/init/main.c --- 2.3/init/main.c Thu Jul 1 14:11:48 1999 +++ build-2.3/init/main.c Thu Jul 1 14:12:39 1999 @@ -1116,8 +1116,6 @@ #endif -extern void initialize_secondary(void); - /* * Activate the first processor. */ @@ -1125,14 +1123,6 @@ asmlinkage void __init start_kernel(void) { char * command_line; - -#ifdef __SMP__ - static int boot_cpu = 1; - /* "current" has been set up, we need to load it now */ - if (!boot_cpu) - initialize_secondary(); - boot_cpu = 0; -#endif /* * Interrupts are still disabled. Do necessary setups, then --------------C865B2303630D6B780C969CC-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/