From owner-freebsd-smp  Sat Jun 24 12:16:55 2000
Delivered-To: freebsd-smp@freebsd.org
Received: from timingpdc.timing.com (timingpdc.timing.com [206.168.13.194])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3AB2B37B640; Sat, 24 Jun 2000 12:16:44 -0700 (PDT)
	(envelope-from smp@timing.com)
Received: from RoadRunner.timing.com ([206.168.13.190])
          by timingpdc.timing.com (Post.Office MTA v3.1.2
          release (PO205-101c) ID# 103-49575U100L2S100) with ESMTP
          id AAA990; Sat, 24 Jun 2000 13:18:37 -0600
Received: from RoadRunner.timing.com (localhost [127.0.0.1])
	by RoadRunner.timing.com (8.9.3/8.9.3) with ESMTP id NAA58694;
	Sat, 24 Jun 2000 13:15:51 -0600 (MDT)
	(envelope-from smp@RoadRunner.timing.com)
Message-Id: <200006241915.NAA58694@RoadRunner.timing.com>
X-Mailer: exmh version 2.0.2 2/24/98
From: Steve Passe <smp@timing.com>
To: msmith@FreeBSD.org
Cc: smp@FreeBSD.org
Subject: breakage to intr_machdep.c
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Sat, 24 Jun 2000 13:15:51 -0600
Sender: owner-freebsd-smp@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

Hi,
 
  Modified files:
    sys/i386/isa         clock.c intr_machdep.c isa_dma.c pcibus.c 
                         spkr.c 
  
  Revision  Changes    Path
  1.32      +68 -2     src/sys/i386/isa/intr_machdep.c

this breaks MP compiles:

cc -c -O -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions 
-ansi  -nostdinc -I- -I. -I../.. -I../../../include  -D_KERNEL -include 
opt_global.h -elf  -mpreferred-stack-boundary=2  ../../i386/isa/intr_machdep.c
../../i386/isa/intr_machdep.c: In function `atpic_attach':
../../i386/isa/intr_machdep.c:191: syntax error before `res'
../../i386/isa/intr_machdep.c:195: `res' undeclared (first use in this 
function)
../../i386/isa/intr_machdep.c:195: (Each undeclared identifier is reported 
only once
../../i386/isa/intr_machdep.c:195: for each function it appears in.)
../../i386/isa/intr_machdep.c:195: `SYS_RES_IRQ' undeclared (first use in this 
function)
*** Error code 1

Stop in /usr/src/sys/compile/LOCAL_MP.

---
The fix is:

*** intr_machdep.c.orig Sat Jun 24 12:49:04 2000
--- intr_machdep.c      Sat Jun 24 12:56:31 2000
***************
*** 66,71 ****
--- 66,72 ----
  #if defined(APIC_IO)
  #include <machine/smp.h>
  #include <machine/smptests.h>                 /** FAST_HI */
+ #include <machine/resource.h>
  #endif /* APIC_IO */
  #ifdef PC98
  #include <pc98/pc98/pc98.h>
***************
*** 188,194 ****
  {
  #ifdef APIC_IO
        int             rid;
!       bus_resource_t  res;
  
        /* try to allocate our IRQ and then free it */
        rid = 0;
--- 189,195 ----
  {
  #ifdef APIC_IO
        int             rid;
!       struct resource *res;
  
        /* try to allocate our IRQ and then free it */
        rid = 0;

--
Steve Passe	| powered by
smp@timing.com	|            Symmetric MultiProcessor FreeBSD




To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-smp" in the body of the message