From owner-svn-src-all@FreeBSD.ORG Sun Jul 28 18:44:21 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 98C12E14; Sun, 28 Jul 2013 18:44:21 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 824E72572; Sun, 28 Jul 2013 18:44:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SIiLJu057108; Sun, 28 Jul 2013 18:44:21 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6SIiInv057089; Sun, 28 Jul 2013 18:44:18 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307281844.r6SIiInv057089@svn.freebsd.org> From: Andriy Gapon Date: Sun, 28 Jul 2013 18:44:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253750 - in head: lib/libc/powerpc/gen lib/libc/powerpc64/gen libexec/rtld-elf/powerpc libexec/rtld-elf/powerpc64 sbin/adjkerntz share/examples/perfmon sys/amd64/include sys/arm/includ... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jul 2013 18:44:21 -0000 Author: avg Date: Sun Jul 28 18:44:17 2013 New Revision: 253750 URL: http://svnweb.freebsd.org/changeset/base/253750 Log: Revert r253748,253749 This WIP should not have been committed yet. Pointyhat to: avg Modified: head/lib/libc/powerpc/gen/syncicache.c head/lib/libc/powerpc64/gen/syncicache.c head/libexec/rtld-elf/powerpc/reloc.c head/libexec/rtld-elf/powerpc64/reloc.c head/sbin/adjkerntz/adjkerntz.c head/share/examples/perfmon/perfmon.c head/sys/amd64/include/cpu.h head/sys/arm/include/cpu.h head/sys/i386/include/cpu.h head/sys/ia64/include/cpu.h head/sys/mips/include/cpu.h head/sys/powerpc/include/cpu.h head/sys/sparc64/include/cpu.h head/tools/tools/vhba/vhba.h head/usr.bin/w/w.c Directory Properties: head/sys/dev/usb/serial/uark.c (props changed) Modified: head/lib/libc/powerpc/gen/syncicache.c ============================================================================== --- head/lib/libc/powerpc/gen/syncicache.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/lib/libc/powerpc/gen/syncicache.c Sun Jul 28 18:44:17 2013 (r253750) @@ -44,6 +44,7 @@ static const char rcsid[] = #endif #include +#include #include #ifdef _STANDALONE Modified: head/lib/libc/powerpc64/gen/syncicache.c ============================================================================== --- head/lib/libc/powerpc64/gen/syncicache.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/lib/libc/powerpc64/gen/syncicache.c Sun Jul 28 18:44:17 2013 (r253750) @@ -44,6 +44,7 @@ static const char rcsid[] = #endif #include +#include #include #ifdef _STANDALONE Modified: head/libexec/rtld-elf/powerpc/reloc.c ============================================================================== --- head/libexec/rtld-elf/powerpc/reloc.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/libexec/rtld-elf/powerpc/reloc.c Sun Jul 28 18:44:17 2013 (r253750) @@ -37,6 +37,7 @@ #include #include #include +#include #include #include Modified: head/libexec/rtld-elf/powerpc64/reloc.c ============================================================================== --- head/libexec/rtld-elf/powerpc64/reloc.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/libexec/rtld-elf/powerpc64/reloc.c Sun Jul 28 18:44:17 2013 (r253750) @@ -37,6 +37,7 @@ #include #include #include +#include #include #include "debug.h" Modified: head/sbin/adjkerntz/adjkerntz.c ============================================================================== --- head/sbin/adjkerntz/adjkerntz.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/sbin/adjkerntz/adjkerntz.c Sun Jul 28 18:44:17 2013 (r253750) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "pathnames.h" Modified: head/share/examples/perfmon/perfmon.c ============================================================================== --- head/share/examples/perfmon/perfmon.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/share/examples/perfmon/perfmon.c Sun Jul 28 18:44:17 2013 (r253750) @@ -32,6 +32,7 @@ #include #include +#include #include #include Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/amd64/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -36,8 +36,6 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ -#ifdef _KERNEL - /* * Definitions unique to i386 cpu support. */ @@ -55,6 +53,7 @@ (ISPL((framep)->tf_cs) == SEL_UPL) #define TRAPF_PC(framep) ((framep)->tf_rip) +#ifdef _KERNEL extern char btext[]; extern char etext[]; Modified: head/sys/arm/include/cpu.h ============================================================================== --- head/sys/arm/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/arm/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -6,11 +6,10 @@ #include -#ifdef _KERNEL - void cpu_halt(void); void swi_vm(void *); +#ifdef _KERNEL static __inline uint64_t get_cyclecount(void) { @@ -20,6 +19,7 @@ get_cyclecount(void) return ((uint64_t)bt.sec << 56 | bt.frac >> 8); } +#endif #define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE) @@ -50,5 +50,4 @@ void *initarm(struct arm_boot_params *); extern char btext[]; extern char etext[]; int badaddr_read(void *, size_t, void *); -#endif #endif /* !MACHINE_CPU_H */ Modified: head/sys/i386/include/cpu.h ============================================================================== --- head/sys/i386/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/i386/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -43,8 +43,6 @@ #include #include -#ifdef _KERNEL - #define cpu_exec(p) /* nothing */ #define cpu_swapin(p) /* nothing */ #define cpu_getstack(td) ((td)->td_frame->tf_esp) @@ -55,6 +53,7 @@ ((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM)) #define TRAPF_PC(framep) ((framep)->tf_eip) +#ifdef _KERNEL extern char btext[]; extern char etext[]; Modified: head/sys/ia64/include/cpu.h ============================================================================== --- head/sys/ia64/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/ia64/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -44,12 +44,12 @@ #include -#ifdef _KERNEL - #define TRAPF_PC(tf) ((tf)->tf_special.iip) #define TRAPF_CPL(tf) ((tf)->tf_special.psr & IA64_PSR_CPL) #define TRAPF_USERMODE(tf) (TRAPF_CPL(tf) != IA64_PSR_CPL_KERN) +#ifdef _KERNEL + #ifdef GPROF extern char btext[]; extern char etext[]; Modified: head/sys/mips/include/cpu.h ============================================================================== --- head/sys/mips/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/mips/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -49,8 +49,6 @@ #include -#if defined(_KERNEL) - /* BEGIN: these are going away */ #define soft_int_mask(softintr) (1 << ((softintr) + 8)) @@ -76,7 +74,9 @@ * A machine-independent interface to the CPU's counter. */ #define get_cyclecount() mips_rd_count() +#endif /* !_LOCORE */ +#if defined(_KERNEL) && !defined(_LOCORE) extern char btext[]; extern char etext[]; @@ -85,6 +85,5 @@ void swi_vm(void *); void cpu_halt(void); void cpu_reset(void); -#endif /* !_LOCORE */ #endif /* _KERNEL */ #endif /* !_MACHINE_CPU_H_ */ Modified: head/sys/powerpc/include/cpu.h ============================================================================== --- head/sys/powerpc/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/powerpc/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -39,8 +39,6 @@ #include #include -#ifdef _KERNEL - /* * CPU Feature Attributes * @@ -100,5 +98,4 @@ void cpu_reset(void); void fork_trampoline(void); void swi_vm(void *); -#endif /* _KERNEL */ #endif /* _MACHINE_CPU_H_ */ Modified: head/sys/sparc64/include/cpu.h ============================================================================== --- head/sys/sparc64/include/cpu.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/sys/sparc64/include/cpu.h Sun Jul 28 18:44:17 2013 (r253750) @@ -40,8 +40,6 @@ #include #include -#ifdef _KERNEL - #define TRAPF_PC(tfp) ((tfp)->tf_tpc) #define TRAPF_USERMODE(tfp) (((tfp)->tf_tstate & TSTATE_PRIV) == 0) @@ -49,6 +47,8 @@ #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) #define cpu_spinwait() /* nothing */ +#ifdef _KERNEL + extern char btext[]; extern char etext[]; Modified: head/tools/tools/vhba/vhba.h ============================================================================== --- head/tools/tools/vhba/vhba.h Sun Jul 28 18:35:43 2013 (r253749) +++ head/tools/tools/vhba/vhba.h Sun Jul 28 18:44:17 2013 (r253750) @@ -43,6 +43,7 @@ #include #include +#include #include #include Modified: head/usr.bin/w/w.c ============================================================================== --- head/usr.bin/w/w.c Sun Jul 28 18:35:43 2013 (r253749) +++ head/usr.bin/w/w.c Sun Jul 28 18:44:17 2013 (r253750) @@ -57,6 +57,7 @@ static const char sccsid[] = "@(#)w.c 8. #include #include +#include #include #include #include