From owner-p4-projects@FreeBSD.ORG Tue Jun 19 11:03:38 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21EA11065676; Tue, 19 Jun 2012 11:03:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9E561065675 for ; Tue, 19 Jun 2012 11:03:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8B4528FC0A for ; Tue, 19 Jun 2012 11:03:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q5JB3aHQ070397 for ; Tue, 19 Jun 2012 11:03:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5JB3as7070394 for perforce@freebsd.org; Tue, 19 Jun 2012 11:03:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Jun 2012 11:03:36 GMT Message-Id: <201206191103.q5JB3as7070394@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 213136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2012 11:03:38 -0000 http://p4web.freebsd.org/@@213136?ac=10 Change 213136 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/19 11:03:23 Shift CHERI headers from sys/mips/cheri to sys/mips/include making them a bit more accessible. Rename them to cheri*.h from cp2*.h as well. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.c#7 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.h#9 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2asm.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2reg.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#1 add .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheriasm.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/pcb.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/proc.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#5 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pm_machdep.c#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#6 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.c#7 (text+ko) ==== @@ -32,9 +32,8 @@ #include #include -#include - -#include +#include +#include /* * Beginnings of a programming interface for explicitly managing capability ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/pcb.h#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include #ifdef CPU_CHERI -#include +#include #endif /* ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/proc.h#4 (text+ko) ==== @@ -40,7 +40,7 @@ #define _MACHINE_PROC_H_ #ifdef CPU_CHERI -#include +#include #endif #ifdef CPU_CNMIPS #include ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#5 (text+ko) ==== @@ -63,8 +63,8 @@ #include #ifdef CPU_CHERI -#include -#include +#include +#include #endif #include "opt_cputype.h" ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pm_machdep.c#4 (text+ko) ==== @@ -70,7 +70,7 @@ #include #ifdef CPU_CHERI -#include +#include #endif #define UCONTEXT_MAGIC 0xACEDBADE ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#6 (text+ko) ==== @@ -65,8 +65,8 @@ #include #ifdef CPU_CHERI -#include -#include +#include +#include #endif #include "assym.s"