From 527fddf74a9ddeaa8faf4346298054f6e643028a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 7 Nov 2006 20:48:15 +0000 Subject: [PATCH] More Machine-dependant/Machine-independant code and header file separation. Numerous machine interfaces have MI APIs and should be declared in MI headers even though the routines are defined in MD sources. * Improve rdtsc()'s API so it can be used in MI code. * Add an explicit enable in machine/${MACHINE}/Makefile.inc for syscons/apm. * Abstract and provide a MI API for it via . * Move additional MI API calls from to . --- sys/cpu/i386/include/cpufunc.h | 4 +++- sys/dev/misc/syscons/Makefile | 7 +++++-- .../linux/i386/linprocfs/linprocfs.h | 4 ++-- .../linux/i386/linprocfs/linprocfs_vnops.c | 4 ++-- sys/emulation/linux/i386/linux_ptrace.c | 4 ++-- sys/kern/kern_exec.c | 4 ++-- sys/kern/kern_ktr.c | 9 ++++++--- sys/kern/sys_process.c | 6 +++--- sys/platform/pc32/Makefile.inc | 3 ++- sys/platform/pc32/i386/db_trace.c | 4 ++-- sys/platform/pc32/i386/machdep.c | 4 ++-- sys/platform/pc32/i386/math_emulate.c | 4 ++-- sys/platform/pc32/i386/procfs_machdep.c | 4 ++-- sys/platform/pc32/i386/tls.c | 4 ++-- sys/platform/pc32/include/md_var.h | 10 +--------- sys/sys/procfs.h | 4 ++-- sys/sys/reg.h | 20 +++++++++++-------- sys/sys/systm.h | 15 ++++++++++++-- sys/vfs/procfs/procfs_dbregs.c | 4 ++-- sys/vfs/procfs/procfs_fpregs.c | 4 ++-- sys/vfs/procfs/procfs_regs.c | 4 ++-- sys/vfs/procfs/procfs_vnops.c | 4 ++-- 22 files changed, 73 insertions(+), 57 deletions(-) diff --git a/sys/cpu/i386/include/cpufunc.h b/sys/cpu/i386/include/cpufunc.h index 35e49a66b2..b9449c0129 100644 --- a/sys/cpu/i386/include/cpufunc.h +++ b/sys/cpu/i386/include/cpufunc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $ - * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.17 2006/11/07 06:43:22 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.18 2006/11/07 20:48:10 dillon Exp $ */ /* @@ -492,6 +492,8 @@ rdpmc(u_int pmc) return (rv); } +#define _RDTSC_SUPPORTED_ + static __inline u_int64_t rdtsc(void) { diff --git a/sys/dev/misc/syscons/Makefile b/sys/dev/misc/syscons/Makefile index 81350e99d5..4801292d97 100644 --- a/sys/dev/misc/syscons/Makefile +++ b/sys/dev/misc/syscons/Makefile @@ -1,5 +1,8 @@ # $FreeBSD: src/sys/modules/syscons/Makefile,v 1.11.2.2 2003/05/15 02:02:39 murray Exp $ -# $DragonFly: src/sys/dev/misc/syscons/Makefile,v 1.2 2003/06/17 04:28:47 dillon Exp $ +# $DragonFly: src/sys/dev/misc/syscons/Makefile,v 1.3 2006/11/07 20:48:11 dillon Exp $ +# + +.include "../../../machine/${MACHINE}/Makefile.inc" SUBDIR = SUBDIR += blank @@ -14,7 +17,7 @@ SUBDIR += snake SUBDIR += star SUBDIR += warp -.if ${MACHINE_ARCH} == "i386" +.ifdef SYSCONS_APM_SUPPORT SUBDIR += apm .endif diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs.h b/sys/emulation/linux/i386/linprocfs/linprocfs.h index e480a817d1..d4719d7391 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs.h +++ b/sys/emulation/linux/i386/linprocfs/linprocfs.h @@ -39,7 +39,7 @@ * @(#)procfs.h 8.9 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs.h,v 1.2.2.4 2001/06/25 19:46:47 pirzyk Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs.h,v 1.8 2004/08/17 18:57:32 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs.h,v 1.9 2006/11/07 20:48:13 dillon Exp $ */ /* @@ -107,7 +107,7 @@ struct vfs_namemap { int vfs_getuserstr (struct uio *, char *, int *); vfs_namemap_t *vfs_findname (vfs_namemap_t *, char *, int); -/* */ +/* */ struct reg; struct fpreg; struct dbreg; diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c index cc694b2803..d9f446d7df 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c +++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c @@ -39,7 +39,7 @@ * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vnops.c,v 1.3.2.5 2001/08/12 14:29:19 rwatson Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.36 2006/09/05 00:55:45 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.37 2006/11/07 20:48:13 dillon Exp $ */ /* @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include "linprocfs.h" #include diff --git a/sys/emulation/linux/i386/linux_ptrace.c b/sys/emulation/linux/i386/linux_ptrace.c index eae9f0371c..94034f7a4a 100644 --- a/sys/emulation/linux/i386/linux_ptrace.c +++ b/sys/emulation/linux/i386/linux_ptrace.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.7.4.3 2003/01/03 17:13:23 kan Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux_ptrace.c,v 1.11 2006/09/19 11:47:35 corecode Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux_ptrace.c,v 1.12 2006/11/07 20:48:12 dillon Exp $ */ #include "opt_cpu.h" @@ -41,10 +41,10 @@ #include #include #include +#include #include #include -#include #include "linux.h" #include "linux_proto.h" diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index e80e458d24..7078f480ec 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/kern_exec.c,v 1.107.2.15 2002/07/30 15:40:46 nectar Exp $ - * $DragonFly: src/sys/kern/kern_exec.c,v 1.49 2006/11/07 17:51:23 dillon Exp $ + * $DragonFly: src/sys/kern/kern_exec.c,v 1.50 2006/11/07 20:48:14 dillon Exp $ */ #include @@ -67,7 +67,7 @@ #include #include -#include +#include #include diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index 6f17507320..b5559af0b1 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -62,7 +62,7 @@ * SUCH DAMAGE. */ /* - * $DragonFly: src/sys/kern/kern_ktr.c,v 1.17 2006/09/05 03:48:12 dillon Exp $ + * $DragonFly: src/sys/kern/kern_ktr.c,v 1.18 2006/11/07 20:48:14 dillon Exp $ */ /* * Kernel tracepoint facility. @@ -215,7 +215,7 @@ ktr_resyncinit(void *dummy) } SYSINIT(ktr_resync, SI_SUB_FINISH_SMP+1, SI_ORDER_ANY, ktr_resyncinit, NULL); -#ifdef SMP +#if defined(SMP) && defined(_RDTSC_SUPPORTED_) static void ktr_resync_remote(void *dummy); extern cpumask_t smp_active_mask; @@ -455,13 +455,16 @@ ktr_write_entry(struct ktr_info *info, const char *file, int line, crit_enter(); entry = ktr_buf[cpu] + (ktr_idx[cpu] & KTR_ENTRIES_MASK); ++ktr_idx[cpu]; +#ifdef _RDTSC_SUPPORTED_ if (cpu_feature & CPUID_TSC) { #ifdef SMP entry->ktr_timestamp = rdtsc() - tsc_offsets[cpu]; #else entry->ktr_timestamp = rdtsc(); #endif - } else { + } else +#endif + { entry->ktr_timestamp = get_approximate_time_t(); } entry->ktr_info = info; diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index f46c249670..a9165cc7e6 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/sys_process.c,v 1.51.2.6 2003/01/08 03:06:45 kan Exp $ - * $DragonFly: src/sys/kern/sys_process.c,v 1.23 2006/09/19 11:47:35 corecode Exp $ + * $DragonFly: src/sys/kern/sys_process.c,v 1.24 2006/11/07 20:48:14 dillon Exp $ */ #include @@ -38,10 +38,10 @@ #include #include #include +#include +#include -#include #include -#include #include #include #include diff --git a/sys/platform/pc32/Makefile.inc b/sys/platform/pc32/Makefile.inc index d4e62eedfb..088db354b4 100644 --- a/sys/platform/pc32/Makefile.inc +++ b/sys/platform/pc32/Makefile.inc @@ -1,7 +1,8 @@ # Used by the device build to check for device support # -# $DragonFly: src/sys/platform/pc32/Makefile.inc,v 1.1 2006/11/07 19:56:25 dillon Exp $ +# $DragonFly: src/sys/platform/pc32/Makefile.inc,v 1.2 2006/11/07 20:48:15 dillon Exp $ ACPICA5_SUPPORT=1 EST_SUPPORT=1 +SYSCONS_APM_SUPPORT=1 diff --git a/sys/platform/pc32/i386/db_trace.c b/sys/platform/pc32/i386/db_trace.c index 17d0673030..f3d9404e10 100644 --- a/sys/platform/pc32/i386/db_trace.c +++ b/sys/platform/pc32/i386/db_trace.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.15 2006/09/19 11:47:35 corecode Exp $ + * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.16 2006/11/07 20:48:15 dillon Exp $ */ #include @@ -32,10 +32,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c index a8ddbf6b20..d5656eb028 100644 --- a/sys/platform/pc32/i386/machdep.c +++ b/sys/platform/pc32/i386/machdep.c @@ -36,7 +36,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.103 2006/11/07 18:50:07 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.104 2006/11/07 20:48:15 dillon Exp $ */ #include "use_apm.h" @@ -74,6 +74,7 @@ #include #include #include +#include #include #include @@ -94,7 +95,6 @@ #include #include -#include #include #include #include diff --git a/sys/platform/pc32/i386/math_emulate.c b/sys/platform/pc32/i386/math_emulate.c index a018415e2f..09f240e885 100644 --- a/sys/platform/pc32/i386/math_emulate.c +++ b/sys/platform/pc32/i386/math_emulate.c @@ -7,7 +7,7 @@ * * from: 386BSD 0.1 * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.35 1999/08/28 00:43:47 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/math_emulate.c,v 1.6 2006/10/23 21:50:30 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/math_emulate.c,v 1.7 2006/11/07 20:48:15 dillon Exp $ */ /* @@ -38,9 +38,9 @@ #include #include +#include #include -#include #include #include diff --git a/sys/platform/pc32/i386/procfs_machdep.c b/sys/platform/pc32/i386/procfs_machdep.c index b86d367504..13213b07cf 100644 --- a/sys/platform/pc32/i386/procfs_machdep.c +++ b/sys/platform/pc32/i386/procfs_machdep.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.6 2006/09/13 18:45:12 swildner Exp $ + * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.7 2006/11/07 20:48:15 dillon Exp $ */ /* @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/platform/pc32/i386/tls.c b/sys/platform/pc32/i386/tls.c index 1cd2792e83..8811707b41 100644 --- a/sys/platform/pc32/i386/tls.c +++ b/sys/platform/pc32/i386/tls.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/platform/pc32/i386/tls.c,v 1.5 2006/11/07 18:50:07 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/tls.c,v 1.6 2006/11/07 20:48:15 dillon Exp $ */ #include @@ -42,10 +42,10 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/platform/pc32/include/md_var.h b/sys/platform/pc32/include/md_var.h index 0bded5a253..3268d780fd 100644 --- a/sys/platform/pc32/include/md_var.h +++ b/sys/platform/pc32/include/md_var.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/md_var.h,v 1.35.2.4 2003/01/22 20:14:53 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.19 2006/10/23 15:42:46 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.20 2006/11/07 20:48:15 dillon Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -53,7 +53,6 @@ extern int (*copyout_vector) (const void *kaddr, void *udaddr, size_t len); extern void (*cpu_idle_hook)(void); extern u_int cpu_exthigh; -extern u_int cpu_feature; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; @@ -73,13 +72,9 @@ struct dbreg; struct mdglobaldata; struct thread; -void bcopyb (const void *from, void *to, size_t len); -void bcopyi (const void *from, void *to, size_t len); void busdma_swi (void); void cpu_gdinit (struct mdglobaldata *gd, int cpu); -void cpu_halt (void); void cpu_idle (void); -void cpu_reset (void); void cpu_setregs (void); void cpu_switch_load_gs (void) __asm(__STRING(cpu_switch_load_gs)); void cpu_heavy_restore (void); /* cannot be called from C */ @@ -97,9 +92,6 @@ void doreti_popl_es_fault (void) __asm(__STRING(doreti_popl_es_fault)); void doreti_popl_fs (void) __asm(__STRING(doreti_popl_fs)); void doreti_popl_fs_fault (void) __asm(__STRING(doreti_popl_fs_fault)); void enable_sse (void); -int fill_fpregs (struct lwp *, struct fpreg *); -int fill_regs (struct lwp *lp, struct reg *regs); -int fill_dbregs (struct lwp *lp, struct dbreg *dbregs); void fillw (int /*u_short*/ pat, void *base, size_t cnt); #if 0 void i486_bzero (volatile void *buf, size_t len); diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h index bd027f444c..de6a4dde4b 100644 --- a/sys/sys/procfs.h +++ b/sys/sys/procfs.h @@ -24,14 +24,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/procfs.h,v 1.2 1999/08/28 00:51:56 peter Exp $ - * $DragonFly: src/sys/sys/procfs.h,v 1.3 2005/03/16 14:30:31 davidxu Exp $ + * $DragonFly: src/sys/sys/procfs.h,v 1.4 2006/11/07 20:48:15 dillon Exp $ */ #ifndef _SYS_PROCFS_H_ #define _SYS_PROCFS_H_ #include -#include +#include typedef struct reg gregset_t; typedef struct fpreg fpregset_t; diff --git a/sys/sys/reg.h b/sys/sys/reg.h index ec1a9cd27d..c406ec03f4 100644 --- a/sys/sys/reg.h +++ b/sys/sys/reg.h @@ -35,13 +35,17 @@ * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/reg.h,v 1.22.2.2 2002/11/07 22:47:55 alfred Exp $ - * $DragonFly: src/sys/sys/reg.h,v 1.1 2006/11/07 06:43:24 dillon Exp $ + * $DragonFly: src/sys/sys/reg.h,v 1.2 2006/11/07 20:48:15 dillon Exp $ + */ +/* + * Machine independant interface to abstract cpu registers that a process + * might have to manipulate (reg, fpreg, and dbreg structures). */ -#ifndef _MACHINE_REG_H_ -#define _MACHINE_REG_H_ +#ifndef _SYS_REG_H_ +#define _SYS_REG_H_ -#include +#include #ifdef _KERNEL @@ -52,9 +56,9 @@ struct proc; struct lwp; -/* - * XXX these interfaces are MI, so they should be declared in a MI place. - */ +int fill_fpregs (struct lwp *, struct fpreg *); +int fill_regs (struct lwp *lp, struct reg *regs); +int fill_dbregs (struct lwp *lp, struct dbreg *dbregs); int set_fpregs (struct lwp *, struct fpreg *); int set_regs (struct lwp *lp, struct reg *regs); void setregs (struct lwp *, u_long, u_long, u_long); @@ -62,4 +66,4 @@ int set_dbregs (struct lwp *lp, struct dbreg *dbregs); #endif -#endif /* !_MACHINE_REG_H_ */ +#endif /* !_SYS_REG_H_ */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 6f98926f3b..fcfab472f1 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -37,7 +37,7 @@ * * @(#)systm.h 8.7 (Berkeley) 3/29/95 * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $ - * $DragonFly: src/sys/sys/systm.h,v 1.44 2006/10/23 15:42:50 dillon Exp $ + * $DragonFly: src/sys/sys/systm.h,v 1.45 2006/11/07 20:48:15 dillon Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -90,6 +90,8 @@ extern int ncpus2_shift; /* log base 2 of ncpus2 */ extern int ncpus2_mask; /* ncpus2 - 1 */ extern int clocks_running; /* timing/timeout subsystem is operational */ +extern u_int cpu_feature; /* CPUID_* features */ + #ifdef INVARIANTS /* The option is always available */ #define KASSERT(exp,msg) do { if (!(exp)) panic msg; } while (0) #define KKASSERT(exp) if (!(exp)) panic("assertion: %s in %s", #exp, __func__) @@ -129,8 +131,10 @@ void *hashinit (int count, struct malloc_type *type, u_long *hashmask); void *phashinit (int count, struct malloc_type *type, u_long *nentries); int cpu_sanitize_frame (struct trapframe *); - +void cpu_halt (void); +void cpu_reset (void); void cpu_boot (int); + void cpu_rootconf (void); extern uint32_t crc32_tab[]; uint32_t crc32(const void *buf, size_t size); @@ -161,7 +165,14 @@ u_quad_t strtouq (const char *, char **, int); /* * note: some functions commonly used by device drivers may be passed * pointers to volatile storage, volatile set to avoid warnings. + * + * NOTE: bcopyb() - is a dumb byte-granular bcopy. This routine is + * explicitly not meant to be sophisticated. + * NOTE: bcopyi() - is a dumb int-granular bcopy (len is still in bytes). + * This routine is explicitly not meant to be sophisticated. */ +void bcopyb (const void *from, void *to, size_t len); +void bcopyi (const void *from, void *to, size_t len); void bcopy (volatile const void *from, volatile void *to, size_t len); void ovbcopy (const void *from, void *to, size_t len); void bzero (volatile void *buf, size_t len); diff --git a/sys/vfs/procfs/procfs_dbregs.c b/sys/vfs/procfs/procfs_dbregs.c index c255d498d0..f6b5624b8f 100644 --- a/sys/vfs/procfs/procfs_dbregs.c +++ b/sys/vfs/procfs/procfs_dbregs.c @@ -41,13 +41,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/miscfs/procfs/procfs_dbregs.c,v 1.4.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_dbregs.c,v 1.7 2005/11/14 18:50:13 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_dbregs.c,v 1.8 2006/11/07 20:48:15 dillon Exp $ */ #include #include #include -#include +#include #include #include diff --git a/sys/vfs/procfs/procfs_fpregs.c b/sys/vfs/procfs/procfs_fpregs.c index c5619ddec9..92d41f6a22 100644 --- a/sys/vfs/procfs/procfs_fpregs.c +++ b/sys/vfs/procfs/procfs_fpregs.c @@ -38,13 +38,13 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_fpregs.c,v 1.11.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_fpregs.c,v 1.7 2005/11/14 18:50:13 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_fpregs.c,v 1.8 2006/11/07 20:48:15 dillon Exp $ */ #include #include #include -#include +#include #include #include diff --git a/sys/vfs/procfs/procfs_regs.c b/sys/vfs/procfs/procfs_regs.c index 1f5a78b57b..de0c829267 100644 --- a/sys/vfs/procfs/procfs_regs.c +++ b/sys/vfs/procfs/procfs_regs.c @@ -38,13 +38,13 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_regs.c,v 1.10.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_regs.c,v 1.8 2005/11/14 18:50:13 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_regs.c,v 1.9 2006/11/07 20:48:15 dillon Exp $ */ #include #include #include -#include +#include #include #include #include diff --git a/sys/vfs/procfs/procfs_vnops.c b/sys/vfs/procfs/procfs_vnops.c index 2c81d078fa..2300c533ff 100644 --- a/sys/vfs/procfs/procfs_vnops.c +++ b/sys/vfs/procfs/procfs_vnops.c @@ -37,7 +37,7 @@ * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.38 2006/09/05 00:55:50 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.39 2006/11/07 20:48:15 dillon Exp $ */ /* @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include -- 2.41.0