From owner-cvs-all Sun Jul 1 18:59:39 2001 Delivered-To: cvs-all@freebsd.org Received: from InterJet.elischer.org (c421509-a.pinol1.sfba.home.com [24.7.86.9]) by hub.freebsd.org (Postfix) with ESMTP id B4FF837B401; Sun, 1 Jul 2001 18:59:32 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org (InterJet.elischer.org [192.168.1.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id UAA10085; Sun, 1 Jul 2001 20:34:37 -0700 (PDT) Message-Id: <200107020334.UAA10085@InterJet.elischer.org> Date: Sun, 1 Jul 2001 20:34:34 -0700 (PDT) From: Julian Elischer To: Mark Peek Cc: John Baldwin , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/sys/alpha/alpha trap.c src/sys/alpha/include Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG cpu.h src/sys/conf files src/sys/i386/i386 trap.c src/sys/ia64/ia64 trap.c src/sys/ia64/include cpu.h src/sys/kern subr_trap.c src/sys/powerpc/powerpc trap.c src/sys/sys proc.h In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Be very carefull, or you'll get a commit bit... On Sat, 30 Jun 2001, Mark Peek wrote: > At 12:51 PM -0700 6/29/01, John Baldwin wrote: > >jhb 2001/06/29 12:51:37 PDT > > > > Modified files: > > sys/alpha/alpha trap.c > > sys/alpha/include cpu.h > > sys/conf files > > sys/i386/i386 trap.c > > sys/ia64/ia64 trap.c > > sys/ia64/include cpu.h > > sys/kern subr_trap.c > > sys/powerpc/powerpc trap.c > > sys/sys proc.h > > Log: > > Move ast() and userret() to sys/kern/subr_trap.c now that they are MI. > > > > Revision Changes Path > > 1.68 +1 -114 src/sys/alpha/alpha/trap.c > > 1.29 +1 -2 src/sys/alpha/include/cpu.h > > 1.538 +1 -0 src/sys/conf/files > > 1.194 +1 -121 src/sys/i386/i386/trap.c > > 1.25 +1 -113 src/sys/ia64/ia64/trap.c > > 1.19 +1 -2 src/sys/ia64/include/cpu.h > > 1.194 +18 -1163 src/sys/kern/subr_trap.c > > 1.2 +1 -9 src/sys/powerpc/powerpc/trap.c > > 1.168 +2 -1 src/sys/sys/proc.h > > > Now that the powerpc code has a real userret() :-), you may want to > commit this patch as well...it allows the powerpc kernel to link > again. (Well, at least link in my build tree...I need Benno to commit > the netbsd versions of autoconf.h and openpicreg.h based on his most > recent changes). > > Mark > > > Index: powerpc/include/cpu.h > =================================================================== > RCS file: /cvs/freebsd/src/sys/powerpc/include/cpu.h,v > retrieving revision 1.2 > diff -u -r1.2 cpu.h > --- powerpc/include/cpu.h 2001/06/29 11:10:40 1.2 > +++ powerpc/include/cpu.h 2001/06/30 21:11:35 > @@ -39,6 +39,9 @@ > #include > #include > > +#define TRAPF_USERMODE(frame) ((frame)->srr1 & PSL_PR) != 0) > +#define TRAPF_PC(frame) ((frame)->srr0) > + > #define CLKF_USERMODE(frame) (((frame)->srr1 & PSL_PR) != 0) > #define CLKF_BASEPRI(frame) ((frame)->pri == 0) > #define CLKF_PC(frame) ((frame)->srr0) > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message