From owner-cvs-all  Sat Jun 30 14:28: 8 2001
Delivered-To: cvs-all@freebsd.org
Received: from alpo.whistle.com (s206m1.whistle.com [207.76.206.1])
	by hub.freebsd.org (Postfix) with ESMTP
	id 08FEC37B403; Sat, 30 Jun 2001 14:28:02 -0700 (PDT)
	(envelope-from mark@whistle.com)
Received: from [207.76.207.129] ([10.1.10.118])
	by alpo.whistle.com (8.9.1a/8.9.1) with ESMTP id OAA27691;
	Sat, 30 Jun 2001 14:26:42 -0700 (PDT)
Mime-Version: 1.0
X-Sender: mark@207.76.206.1
Message-Id: <p05100307b763f30da1d0@[207.76.207.129]>
In-Reply-To: <200106291951.f5TJpbX31534@freefall.freebsd.org>
References: <200106291951.f5TJpbX31534@freefall.freebsd.org>
Date: Sat, 30 Jun 2001 14:26:41 -0700
To: John Baldwin <jhb@FreeBSD.ORG>, cvs-committers@FreeBSD.ORG,
	cvs-all@FreeBSD.ORG
From: Mark Peek <mark@whistle.com>
Subject: Re: cvs commit: src/sys/alpha/alpha trap.c src/sys/alpha/include
 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
Content-Type: text/plain; charset="us-ascii" ; format="flowed"
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

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 <machine/pcb.h>
  #include <machine/psl.h>

+#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