system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert r253748,253749

Browse source 
This WIP should not have been committed yet.

Pointyhat to:	avg
This commit is contained in:
Andriy Gapon 2013-07-28 18:44:17 +00:00
parent c722ec3a51
commit a29cc9a34b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=253750
15 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/libc/powerpc/gen/syncicache.c
View file

@ -44,6 +44,7 @@ static const char rcsid[] =
#endif #endif
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <machine/cpu.h>
#include <machine/md_var.h> #include <machine/md_var.h>
#ifdef _STANDALONE #ifdef _STANDALONE

1
lib/libc/powerpc64/gen/syncicache.c
View file

@ -44,6 +44,7 @@ static const char rcsid[] =
#endif #endif
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <machine/cpu.h>
#include <machine/md_var.h> #include <machine/md_var.h>
#ifdef _STANDALONE #ifdef _STANDALONE

1
libexec/rtld-elf/powerpc/reloc.c
View file

@ -37,6 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <machine/cpu.h>
#include <machine/atomic.h> #include <machine/atomic.h>
#include <machine/md_var.h> #include <machine/md_var.h>

1
libexec/rtld-elf/powerpc64/reloc.c
View file

@ -37,6 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <machine/cpu.h>
#include <machine/md_var.h> #include <machine/md_var.h>
#include "debug.h" #include "debug.h"

1
sbin/adjkerntz/adjkerntz.c
View file

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <syslog.h> #include <syslog.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/param.h> #include <sys/param.h>
#include <machine/cpu.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include "pathnames.h" #include "pathnames.h"

1
share/examples/perfmon/perfmon.c
View file

@ -32,6 +32,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <machine/cpu.h>
#include <machine/perfmon.h> #include <machine/perfmon.h>
#include <stdio.h> #include <stdio.h>

3
sys/amd64/include/cpu.h
View file

@ -36,8 +36,6 @@
#ifndef _MACHINE_CPU_H_ #ifndef _MACHINE_CPU_H_
#define _MACHINE_CPU_H_ #define _MACHINE_CPU_H_
#ifdef _KERNEL
/* /*
* Definitions unique to i386 cpu support. * Definitions unique to i386 cpu support.
*/ */
@ -55,6 +53,7 @@
(ISPL((framep)->tf_cs) == SEL_UPL) (ISPL((framep)->tf_cs) == SEL_UPL)
#define TRAPF_PC(framep) ((framep)->tf_rip) #define TRAPF_PC(framep) ((framep)->tf_rip)
#ifdef _KERNEL
extern char btext[]; extern char btext[];
extern char etext[]; extern char etext[];

5
sys/arm/include/cpu.h
View file

@ -6,11 +6,10 @@
#include <machine/armreg.h> #include <machine/armreg.h>
#ifdef _KERNEL
void cpu_halt(void); void cpu_halt(void);
void swi_vm(void *); void swi_vm(void *);
#ifdef _KERNEL
static __inline uint64_t static __inline uint64_t
get_cyclecount(void) get_cyclecount(void)
{ {
@ -20,6 +19,7 @@ get_cyclecount(void)
return ((uint64_t)bt.sec << 56 | bt.frac >> 8); return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
} }
#endif
#define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE) #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 btext[];
extern char etext[]; extern char etext[];
int badaddr_read(void *, size_t, void *); int badaddr_read(void *, size_t, void *);
#endif
#endif /* !MACHINE_CPU_H */ #endif /* !MACHINE_CPU_H */

3
sys/i386/include/cpu.h
View file

@ -43,8 +43,6 @@
#include <machine/frame.h> #include <machine/frame.h>
#include <machine/segments.h> #include <machine/segments.h>
#ifdef _KERNEL
#define cpu_exec(p) /* nothing */ #define cpu_exec(p) /* nothing */
#define cpu_swapin(p) /* nothing */ #define cpu_swapin(p) /* nothing */
#define cpu_getstack(td) ((td)->td_frame->tf_esp) #define cpu_getstack(td) ((td)->td_frame->tf_esp)
@ -55,6 +53,7 @@
((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM)) ((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM))
#define TRAPF_PC(framep) ((framep)->tf_eip) #define TRAPF_PC(framep) ((framep)->tf_eip)
#ifdef _KERNEL
extern char btext[]; extern char btext[];
extern char etext[]; extern char etext[];

4
sys/ia64/include/cpu.h
View file

@ -44,12 +44,12 @@
#include <machine/frame.h> #include <machine/frame.h>
#ifdef _KERNEL
#define TRAPF_PC(tf) ((tf)->tf_special.iip) #define TRAPF_PC(tf) ((tf)->tf_special.iip)
#define TRAPF_CPL(tf) ((tf)->tf_special.psr & IA64_PSR_CPL) #define TRAPF_CPL(tf) ((tf)->tf_special.psr & IA64_PSR_CPL)
#define TRAPF_USERMODE(tf) (TRAPF_CPL(tf) != IA64_PSR_CPL_KERN) #define TRAPF_USERMODE(tf) (TRAPF_CPL(tf) != IA64_PSR_CPL_KERN)
#ifdef _KERNEL
#ifdef GPROF #ifdef GPROF
extern char btext[]; extern char btext[];
extern char etext[]; extern char etext[];

5
sys/mips/include/cpu.h
View file

@ -49,8 +49,6 @@
#include <machine/endian.h> #include <machine/endian.h>
#if defined(_KERNEL)
/* BEGIN: these are going away */ /* BEGIN: these are going away */
#define soft_int_mask(softintr) (1 << ((softintr) + 8)) #define soft_int_mask(softintr) (1 << ((softintr) + 8))
@ -76,7 +74,9 @@
* A machine-independent interface to the CPU's counter. * A machine-independent interface to the CPU's counter.
*/ */
#define get_cyclecount() mips_rd_count() #define get_cyclecount() mips_rd_count()
#endif /* !_LOCORE */
#if defined(_KERNEL) && !defined(_LOCORE)
extern char btext[]; extern char btext[];
extern char etext[]; extern char etext[];
@ -85,6 +85,5 @@ void swi_vm(void *);
void cpu_halt(void); void cpu_halt(void);
void cpu_reset(void); void cpu_reset(void);
#endif /* !_LOCORE */
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_MACHINE_CPU_H_ */ #endif /* !_MACHINE_CPU_H_ */

3
sys/powerpc/include/cpu.h
View file

@ -39,8 +39,6 @@
#include <machine/pcb.h> #include <machine/pcb.h>
#include <machine/psl.h> #include <machine/psl.h>
#ifdef _KERNEL
/* /*
* CPU Feature Attributes * CPU Feature Attributes
* *
@ -100,5 +98,4 @@ void cpu_reset(void);
void fork_trampoline(void); void fork_trampoline(void);
void swi_vm(void *); void swi_vm(void *);
#endif /* _KERNEL */
#endif /* _MACHINE_CPU_H_ */ #endif /* _MACHINE_CPU_H_ */

4
sys/sparc64/include/cpu.h
View file

@ -40,8 +40,6 @@
#include <machine/frame.h> #include <machine/frame.h>
#include <machine/tstate.h> #include <machine/tstate.h>
#ifdef _KERNEL
#define TRAPF_PC(tfp) ((tfp)->tf_tpc) #define TRAPF_PC(tfp) ((tfp)->tf_tpc)
#define TRAPF_USERMODE(tfp) (((tfp)->tf_tstate & TSTATE_PRIV) == 0) #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_setstack(td, sp) ((td)->td_frame->tf_sp = (sp))
#define cpu_spinwait() /* nothing */ #define cpu_spinwait() /* nothing */
#ifdef _KERNEL
extern char btext[]; extern char btext[];
extern char etext[]; extern char etext[];

1
tools/tools/vhba/vhba.h
View file

@ -43,6 +43,7 @@
#include <sys/proc.h> #include <sys/proc.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/stdarg.h> #include <machine/stdarg.h>
#include <cam/cam.h> #include <cam/cam.h>

1
usr.bin/w/w.c
View file

@ -57,6 +57,7 @@ static const char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94";
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/tty.h> #include <sys/tty.h>
#include <machine/cpu.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>