On Thu, Nov 11, 2010 at 9:30 PM, Wilkinson, Alex <alex.wilkin...@dsto.defence.gov.au> wrote: > > 0n Fri, Nov 12, 2010 at 02:40:28AM +0200, Alexander Motin wrote: > > >I've created a patch, merging all kernel event timers related stuff from > >HEAD to 8-STABLE. The only thing I have skipped at this moment was mips > >architecture, because of too big code difference there between HEAD and > >8-STABLE. Patch appeared to be quite large and includes more then 60 SVN > >revisions from HEAD. I hope I haven't missed anything important. I would > >like to ask interested people to test it. Patched code successfully > >builds on all platforms and successfully runs on my amd64 test machine. > > > >In HEAD code seems to be working enough stable, There only two known > >open issues at the moment: > > - kernel freeze on XEN HVM when using LAPIC timer in one-shot mode -- > >can be workarounded by switching to periodic mode or other timer. > > - if HPET interrupt shared with other device, system load average may > >lie (report +1 value) -- not a timer problem and not fatal. > >Please report me if you find anything else. > > > >Latest patch can be found here: > >http://people.freebsd.org/~mav/timers_merge/timers_merge-20101111.patch > > > >Merge instructions (list of revisions, if somebody want to redo it): > >http://people.freebsd.org/~mav/timers_merge/guide-20101111 > > > >After patching you need just rebuild/reinstall the kernel. I haven't > >merged related manual pages yet, so, if needed, consult with man pages > >from HEAD: eventtimers(7), attimer(4), atrtc(4), hpet(4). > > patches apply cleanly but buildkernel fails: > > make -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | MKDEP_CPP="cc -E" CC="cc" > xargs mkdep -a -f .newdep -O2 -pipe -fno-strict-aliasing -march=nocona > -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef > -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/usr/src/sys > -I/usr/src/sys/contrib/altq -I/usr/src/sys/contrib/ipfilter > -I/usr/src/sys/contrib/pf -I/usr/src/sys/dev/ath > -I/usr/src/sys/dev/ath/ath_hal -I/usr/src/sys/contrib/ngatm > -I/usr/src/sys/dev/twa -I/usr/src/sys/gnu/fs/xfs/FreeBSD > -I/usr/src/sys/gnu/fs/xfs/FreeBSD/support -I/usr/src/sys/gnu/fs/xfs > -I/usr/src/sys/contrib/opensolaris/compat -I/usr/src/sys/dev/cxgb -D_KERNEL > -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common > -finline-limit=8000 --param inline-unit-growth=100 --param > large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel > -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow > -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector > cc: /usr/src/sys/kern/kern_et.c: No such file or directory > cc: /usr/src/sys/kern/kern_clocksource.c: No such file or directory > /usr/src/sys/dev/acpica/acpi_hpet.c:46:24: error: sys/timeet.h: No such file > or directory > /usr/src/sys/x86/x86/local_apic.c:52:24: error: sys/timeet.h: No such file or > directory > /usr/src/sys/x86/isa/atrtc.c:45:24: error: sys/timeet.h: No such file or > directory > /usr/src/sys/x86/isa/clock.c:60:24: error: sys/timeet.h: No such file or > directory > mkdep: compile failed > *** Error code 1 > > Stop in /usr/obj/usr/src/sys/MARGS. > *** Error code 1 > > Stop in /usr/src. > *** Error code 1 > > Stop in /usr/src. >
Revert the patch (patch -R) and reapply the patch with -p0: [/usr/src]# patch -p0 < /path/to/file.patch ...and try it again :) -Brandon _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
