Date: Sat, 28 Oct 2006 16:35:56 GMT From: Alexander Leidinger <netchild@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108608 for review Message-ID: <200610281635.k9SGZuN5096152@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108608 Change 108608 by netchild@netchild_magellan on 2006/10/28 16:35:19 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#13 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#7 integrate .. //depot/projects/linuxolator/src/sys/conf/files#7 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files.ia64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/profile.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_fattime.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/agp.c#3 integrate .. //depot/projects/linuxolator/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/clock.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/queue.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/rtprio.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sched.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/soundcard.h#3 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.656 2006/10/12 12:48:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1120,7 +1120,11 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/prof_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.24 2005/05/14 09:10:00 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.27 2006/10/28 06:38:51 bde Exp $"); #ifdef GUPROF #if 0 @@ -43,14 +43,8 @@ #if 0 #include <machine/perfmon.h> #endif -#include <machine/profile.h> -#undef MCOUNT -#endif - -#include <machine/asmacros.h> #include <machine/timerreg.h> -#ifdef GUPROF #define CPUTIME_CLOCK_UNINITIALIZED 0 #define CPUTIME_CLOCK_I8254 1 #define CPUTIME_CLOCK_TSC 2 @@ -80,7 +74,7 @@ # \n\ # Check that we are profiling. Do it early for speed. \n\ # \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # __mcount is the same as [.]mcount except the caller \n\ @@ -98,11 +92,11 @@ jmp .got_frompc \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mcount)) " \n\ -" __XSTRING(HIDENAME(mcount)) ": \n\ + .globl .mcount \n\ +.mcount: \n\ .globl __cyg_profile_func_enter \n\ __cyg_profile_func_enter: \n\ - cmpl $GMON_PROF_OFF," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ # The caller's stack frame has already been built, so \n\ @@ -126,7 +120,7 @@ \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mcount)) " \n\ + call mcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ @@ -139,7 +133,7 @@ ret \n\ "); #else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler +#error "this file needs to be ported to your compiler" #endif /* __GNUCLIKE_ASM */ #ifdef GUPROF @@ -164,11 +158,11 @@ GMON_PROF_HIRES = 4 \n\ \n\ .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ + .globl .mexitcount \n\ +.mexitcount: \n\ .globl __cyg_profile_func_exit \n\ __cyg_profile_func_exit: \n\ - cmpl $GMON_PROF_HIRES," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ + cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\ jne .mexitcount_exit \n\ pushq %rax \n\ pushq %rdx \n\ @@ -180,7 +174,7 @@ movq 7*8(%rsp),%rdi \n\ pushfq \n\ cli \n\ - call " __XSTRING(CNAME(mexitcount)) " \n\ + call mexitcount \n\ popfq \n\ popq %r9 \n\ popq %r8 \n\ @@ -192,8 +186,6 @@ .mexitcount_exit: \n\ ret \n\ "); -#else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler #endif /* __GNUCLIKE_ASM */ /* @@ -375,17 +367,4 @@ } #endif } - -#else /* !GUPROF */ -#ifdef __GNUCLIKE_ASM -__asm(" \n\ - .text \n\ - .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ - ret \n\ -"); -#else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler -#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ ==== //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); /* * AMD64 Trap and System call handling @@ -299,8 +299,10 @@ case T_PAGEFLT: /* page fault */ addr = frame.tf_addr; +#ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); +#endif i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; @@ -757,8 +759,10 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); +#ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); +#endif params = (caddr_t)frame.tf_rsp + sizeof(register_t); code = frame.tf_rax; orig_tf_rflags = frame.tf_rflags; ==== //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ machine amd64 @@ -14,3 +14,6 @@ # UART chips on this platform device uart_ns8250 + +# KSE support went from being default to a kernel option +options KSE ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.468 2006/10/26 22:11:34 jb Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.62 2006/10/20 09:52:26 des Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.63 2006/10/23 13:23:13 ru Exp $ # # @@ -257,8 +257,6 @@ # Debugging. options VGA_DEBUG -device splash # Splash screen and screen saver support - # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as ==== //depot/projects/linuxolator/src/sys/amd64/include/asmacros.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.30 2006/03/14 00:01:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -37,14 +37,12 @@ /* XXX too much duplication in various asm*.h's. */ /* - * CNAME and HIDENAME manage the relationship between symbol names in C + * CNAME is used to manage the relationship between symbol names in C * and the equivalent assembly language names. CNAME is given a name as * it would be used in a C program. It expands to the equivalent assembly - * language name. HIDENAME is given an assembly-language name, and expands - * to a possibly-modified form that will be invisible to C programs. + * language name. */ #define CNAME(csym) csym -#define HIDENAME(asmsym) .asmsym #define ALIGN_DATA .p2align 3 /* 8 byte alignment, zero filled */ #ifdef GPROF @@ -108,8 +106,12 @@ #define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popq %rcx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT -#define MEXITCOUNT call HIDENAME(mexitcount) +#ifdef GUPROF +#define MEXITCOUNT call .mexitcount #define ret MEXITCOUNT ; NON_GPROF_RET +#else +#define MEXITCOUNT +#endif #else /* !GPROF */ /* ==== //depot/projects/linuxolator/src/sys/amd64/include/profile.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.45 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.48 2006/10/28 13:12:06 bde Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,7 +61,7 @@ #define MCOUNT_OVERHEAD(label) \ __asm __volatile("pushq %0; call __mcount; popq %%rcx" \ : \ - : "i" (profil) \ + : "i" (label) \ : "ax", "dx", "cx", "di", "si", "r8", "r9", "memory") #define MEXITCOUNT_OVERHEAD() \ __asm __volatile("call .mexitcount; 1:" \ @@ -114,11 +114,11 @@ #ifdef __GNUCLIKE_ASM #define MCOUNT __asm(" \n\ + .text \n\ + .p2align 4,0x90 \n\ .globl .mcount \n\ - .type .mcount @function \n\ + .type .mcount,@function \n\ .mcount: \n\ - pushq %rbp \n\ - movq %rsp,%rbp \n\ pushq %rdi \n\ pushq %rsi \n\ pushq %rdx \n\ @@ -126,9 +126,8 @@ pushq %r8 \n\ pushq %r9 \n\ pushq %rax \n\ - movq 8(%rbp),%rsi \n\ - movq (%rbp),%rdi \n\ - movq 8(%rdi),%rdi \n\ + movq 8(%rbp),%rdi \n\ + movq 7*8(%rsp),%rsi \n\ call _mcount \n\ popq %rax \n\ popq %r9 \n\ @@ -137,7 +136,6 @@ popq %rdx \n\ popq %rsi \n\ popq %rdi \n\ - leave \n\ ret \n\ .size .mcount, . - .mcount"); #if 0 @@ -171,11 +169,7 @@ } #endif #else /* !__GNUCLIKE_ASM */ -#define MCOUNT \ -void \ -mcount() \ -{ \ -} +#define MCOUNT #endif /* __GNUCLIKE_ASM */ typedef u_long uintfptr_t; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.5 2006/08/27 08:56:53 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.6 2006/10/28 10:59:59 netchild Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.24 2006/10/28 11:24:38 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.23 2006/10/15 14:24:09 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.24 2006/10/28 11:24:38 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.23 2006/10/15 14:24:09 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.24 2006/10/28 11:24:38 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp */ #include <bsm/audit_kevents.h> ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#8 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.21 2006/10/15 14:22:12 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/arm/arm/nexus.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.7 2006/04/20 04:12:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.9 2006/10/25 21:11:46 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -127,8 +127,11 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, driver_intr_t *intr, void *arg, void **cookiep) { - arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, rman_get_start(res), flags, cookiep); + int i; + + for (i = rman_get_start(res); i <= rman_get_end(res); i++) + arm_setup_irqhandler(device_get_nameunit(child), + intr, arg, i, flags, cookiep); return (0); } @@ -136,8 +139,10 @@ nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih) { int error; + int i; - arm_mask_irq(rman_get_start(r)); + for (i = rman_get_start(r); i <= rman_get_end(r); i++) + arm_mask_irq(rman_get_start(r)); error = arm_remove_irqhandler(ih); return (error); } ==== //depot/projects/linuxolator/src/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.31 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.32 2006/10/26 21:42:16 jb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -263,8 +263,10 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); +#ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); +#endif } /* Grab the current pcb */ @@ -730,8 +732,10 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); +#ifdef KSE if (td->td_proc->p_flag & P_SA) thread_user_enter(td); +#endif } fault_pc = tf->tf_pc; if (td->td_md.md_spinlock_count == 0) { @@ -1005,8 +1009,10 @@ td->td_frame = frame; td->td_pticks = 0; +#ifdef KSE if (td->td_proc->p_flag & P_SA) thread_user_enter(td); +#endif /* * Make sure the program counter is correctly aligned so we * don't take an alignment fault trying to read the opcode. ==== //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.27 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -465,13 +465,13 @@ vm_offset_t addr = alloc_firstaddr; KASSERT(alloc_firstaddr != 0, ("arm_ptovirt called to early ?")); - for (i = 0; dump_avail[i]; i += 2) { + for (i = 0; dump_avail[i + 1]; i += 2) { if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) break; addr += (dump_avail[i + 1] & L1_S_FRAME) + L1_S_SIZE - (dump_avail[i] & L1_S_FRAME); } - KASSERT(dump_avail[i] != 0, ("Trying to access invalid physical address")); + KASSERT(dump_avail[i + 1] != 0, ("Trying to access invalid physical address")); return (addr + (pa - (dump_avail[i] & L1_S_FRAME))); } @@ -487,12 +487,12 @@ * to be able to do a pa => va association for any address. */ - for (i = 0; dump_avail[i]; i+= 2) { + for (i = 0; dump_avail[i + 1]; i+= 2) { to_map += (dump_avail[i + 1] & L1_S_FRAME) + L1_S_SIZE - (dump_avail[i] & L1_S_FRAME); } alloc_firstaddr = mapaddr = KERNBASE - to_map; - for (i = 0; dump_avail[i]; i+= 2) { + for (i = 0; dump_avail[i + 1]; i+= 2) { vm_offset_t size = (dump_avail[i + 1] & L1_S_FRAME) + L1_S_SIZE - (dump_avail[i] & L1_S_FRAME); vm_offset_t did = 0; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_sscreg.h#3 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.2 2006/10/20 07:08:15 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.3 2006/10/25 07:58:18 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H @@ -132,4 +132,18 @@ #define SSC_TFMR_DATDEF (1u << 5) /* DATDEF: Data Default Value */ #define SSC_TFMR_DATLEN (0x1fu << 0) /* DATLEN: Data Length */ +/* SSC_SR */ +#define SSC_SR_TXRDY (1u << 0) +#define SSC_SR_TXEMPTY (1u << 1) +#define SSC_SR_ENDTX (1u << 2) +#define SSC_SR_TXBUFE (1u << 3) +#define SSC_SR_RXRDY (1u << 4) +#define SSC_SR_OVRUN (1u << 5) +#define SSC_SR_ENDRX (1u << 6) +#define SSC_SR_RXBUFF (1u << 7) +#define SSC_SR_TXSYN (1u << 10) +#define SSC_SR_RSSYN (1u << 11) +#define SSC_SR_TXEN (1u << 16) +#define SSC_SR_RXEN (1u << 17) + #endif /* ARM_AT91_AT91_SSCREG_H */ ==== //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#3 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.17 2006/10/20 07:03:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.18 2006/10/26 21:42:17 jb Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -456,7 +456,11 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/at91/std.at91#2 (text) ==== @@ -1,5 +1,10 @@ -# $FreeBSD: src/sys/arm/at91/std.at91,v 1.2 2006/07/14 15:20:31 imp Exp $ +# $FreeBSD: src/sys/arm/at91/std.at91,v 1.3 2006/10/25 08:00:11 imp Exp $ files "../at91/files.at91" cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm9 +makeoptions KERNPHYSADDR=0x20000000 +makeoptions KERNVIRTADDR=0xc0000000 +options KERNPHYSADDR=0x20000000 +options KERNVIRTADDR=0xc0000000 +options PHYSADDR=0x20000000 ==== //depot/projects/linuxolator/src/sys/arm/at91/std.kb920x#2 (text) ==== @@ -1,10 +1,5 @@ -#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.3 2006/07/14 15:20:31 imp Exp $ +#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.4 2006/10/25 08:00:11 imp Exp $ include "../at91/std.at91" files "../at91/files.kb920x" -makeoptions KERNPHYSADDR=0x20000000 -makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 -options KERNVIRTADDR=0xc0000000 -options PHYSADDR=0x20000000 options STARTUP_PAGETABLE_ADDR=0x20800000 ==== //depot/projects/linuxolator/src/sys/arm/conf/EP80219#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.1 2006/08/24 23:51:27 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.3 2006/10/26 22:11:35 jb Exp $ machine arm ident EP80219 ==== //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.15 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.17 2006/10/26 22:11:35 jb Exp $ machine arm ident IQ31244 ==== //depot/projects/linuxolator/src/sys/arm/conf/KB920X#2 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.9 2006/07/17 21:17:20 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.11 2006/10/26 22:11:35 jb Exp $ machine arm ident KB920X ==== //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.10 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.12 2006/10/26 22:11:35 jb Exp $ machine arm ident SIMICS ==== //depot/projects/linuxolator/src/sys/arm/conf/SKYEYE#2 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.5 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.7 2006/10/26 22:11:35 jb Exp $ machine arm ident KB920X ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.18 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.19 2006/10/26 21:42:17 jb Exp $"); #include "opt_md.h" @@ -423,7 +423,11 @@ /* Set stack for exception handlers */ +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.2 2006/08/27 13:23:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.3 2006/10/26 21:42:17 jb Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -429,7 +429,11 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.23 2006/08/24 23:51:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.24 2006/10/26 21:42:17 jb Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -427,7 +427,11 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/linuxolator/src/sys/boot/arm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $ +# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $ -SUBDIR=at91 +SUBDIR= .include <bsd.subdir.mk> ==== //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.79 2005/11/03 07:35:36 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.81 2006/10/26 19:41:02 ru Exp $"); #include <sys/param.h> #include <sys/disklabel.h> @@ -79,7 +79,7 @@ #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 14 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 @@ -99,12 +99,14 @@ extern uint32_t _end; -static const char optstr[NOPT] = "DhaCgmnpqrsv"; /* Also 'P', 'S' */ +static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ static const unsigned char flags[NOPT] = { RBX_DUAL, RBX_SERIAL, RBX_ASKNAME, RBX_CDROM, + RBX_CONFIG, + RBX_KDB, RBX_GDB, RBX_MUTE, RBX_NOINTR, @@ -332,7 +334,7 @@ return; } if (fmt == 0) { - addr = hdr.ex.a_entry; + addr = hdr.ex.a_entry & 0xffffff; p = PTOV(addr); fs_off = PAGE_SIZE; if (xfsread(ino, p, hdr.ex.a_text)) @@ -366,7 +368,7 @@ j++; } for (i = 0; i < 2; i++) { - p = PTOV(ep[i].p_paddr); + p = PTOV(ep[i].p_paddr & 0xffffff); fs_off = ep[i].p_offset; if (xfsread(ino, p, ep[i].p_filesz)) return; @@ -387,7 +389,7 @@ p += es[i].sh_size; } } - addr = hdr.eh.e_entry; + addr = hdr.eh.e_entry & 0xffffff; } bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(kname); ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf32_freebsd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.14 2004/08/29 00:48:41 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.15 2006/10/26 20:04:22 ru Exp $"); #include <sys/param.h> #include <sys/exec.h> @@ -46,7 +46,7 @@ struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec }; /* >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610281635.k9SGZuN5096152>