Re: CVS commit: src
On Thu, Feb 24, 2011 at 04:45:30PM +0100, Joerg Sonnenberger wrote: pretty much unchanged. Feel free to perform benchmarks if you want. There are also changes to EST in that time window... This must be a bad joke. The things I did were just simple refactoring. As you should be well aware of, with est(4) and powernow(4) the frequencies are touched only by an explicit request from the system administrator (or possibly, estd(1)). Nothing like this could have happened from my changes. - Jukka. PS. Besides, I think Paul runs his tests on AMD.
Re: CVS commit: src/sys/net80211
On 02/25/11 11:45, Matthias Scheler wrote: Module Name:src Committed By: tron Date: Fri Feb 25 10:45:57 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: Remove duplicate definitions which break the build. Thanks. I was about testing a fix but your release build finished earlier than mine. Christoph
Re: CVS commit: src/sys/arch
On 02/24/11 12:02, Jukka Ruohonen wrote: On Thu, Feb 24, 2011 at 10:56:04AM +, Jukka Ruohonen wrote: Log Message: Move PowerNow! to the cpufeaturebus. I tried to be very careful, but please test for any fall over. acpicpu(4) work on both hp laptops. powernow only tries to attach on my K8 machine where initialization fails as before = no regression. Christoph
Re: CVS commit: src
On Fri Feb 25 2011 at 12:36:07 +0200, Jukka Ruohonen wrote: On Thu, Feb 24, 2011 at 04:45:30PM +0100, Joerg Sonnenberger wrote: pretty much unchanged. Feel free to perform benchmarks if you want. There are also changes to EST in that time window... This must be a bad joke. The things I did were just simple refactoring. As you should be well aware of, with est(4) and powernow(4) the frequencies are touched only by an explicit request from the system administrator (or possibly, estd(1)). Nothing like this could have happened from my changes. Don't worry, it is. Andreas performed a run with a more exact timestamp, and everyone can see for themselves: http://www.gson.org/netbsd/bugs/build/commits-2011.02.html Scroll down to 2004.02.24. Our commit guidelines say that changes which cause unhandled test regressions will be backed out, so I want to see the issue investigated and addressed instead of indifference and excuses. -- älä karot toivorikkauttas, kyl rätei ja lumpui piisaa
Re: CVS commit: src
On Thu, Feb 24, 2011 at 04:28:50AM +, Joerg Sonnenberger wrote: Module Name: src Committed By: joerg Date: Thu Feb 24 04:28:49 UTC 2011 Modified Files: src/sys/arch/amd64/include: mcontext.h types.h This part breaks building textproc/icu: c++ -I/usr/include -D_REENTRANT -I. -I../common-DU_I18N_IMPLEMENTATION -O2 -I/usr/include -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long -fvisibility=hidden -c -DPIC -fPIC -o fmtable.o fmtable.cpp In file included from /usr/include/machine/signal.h:49, from /usr/include/sys/siginfo.h:35, from /usr/include/sys/signal.h:114, from /usr/include/signal.h:45, from decContext.h:61, from decContext.c:25: /usr/include/machine/mcontext.h:87: error: expected '=', ',', ';', 'asm' or '__a ttribute__' before 'void' Thomas
Re: CVS commit: src
On Fri Feb 25 2011 at 15:19:30 +0100, Joerg Sonnenberger wrote: I get time outs for stress_long and stress_short (rump/rumpkern/t_sp). Those are because of, from what I could tell, this: 0xbbbd45c5 fcntl+21: mov%gs:0x0,%edi == segfault Notably, those tests exercise threads and processes more heavily than any other test we have: they create 256 concurrent racing threads over several processes which are killed and recreated. I see a number of failing rumphijack test cases (t_vfs cpcopy, mv_nox, mv_x, paxcopy). Those I didn't investigate because they appear amd64-only. They are new tests, so there might be something else wrong with them too, but I can't see anything else immediately suspicious in the commit window after which they started crashing. -- älä karot toivorikkauttas, kyl rätei ja lumpui piisaa
Re: CVS commit: src
... I see a failing test for SSP (lib/libc/ssp/t_ssp raw), which is just a broken test case. ... I have been meaning to look into this and figure out what's wrong with this test. It was simply imported from the old test framework without a lot of scrutiny. I hope to get this resolved over the weekend. - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com| | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net | | Kernel Developer | | pgoyette at netbsd.org | -
Re: CVS commit: src/sys/net80211
On Fri, Feb 25, 2011 at 08:01:50AM +, Christoph Egger wrote: Module Name: src Committed By: cegger Date: Fri Feb 25 08:01:49 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: sync with FreeBSD rev 1.11. No binary changes. Careful: NetBSD follows the standard, http://www.radiotap.net/defined-fields, and field 18 has not been standardized. Please back out this change (and all of the subsequent changes) and send a patch for review to tech-net. Dave -- David Young OJC Technologies dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24
Re: CVS commit: src/sys/dev/acpi
On Fri, Feb 25, 2011 at 07:55:07PM +, Jukka Ruohonen wrote:
Log Message:
Start to derive the percpu(9) (or per-domain) state coordination
mechanisms by parsing the _CSD, _PSD, and _TSD objects by default.
This is quite interesting development affecting the whole x86; the sleep and
performance states are no longer necessarily shared by all CPUs in the system.
Currently we do a xcall(9) and write the MSRs to all CPUs. But new x86 CPUs
can do percpu(9) -- or rather per-core or per CPU domain -- coordination.
Note that these are not software constructs or BIOS constructs; as
usual, ACPI just supplies the data for us. While I need to study this more,
the basic scenario is:
set 1 = { CPU0, CPU1 } and set 2 = { CPU2, CPU3 }.
Write the MSR for CPU0 - the whole set 1 transforms.
This is also important due to the recent TurboBoost and AMD's equivalent;
The set 1 enters C3 - the set 2 can enter high-performance P-state.
Are there any plans for kernel equivalent to cpuset(3)?
- Jukka.
Re: CVS commit: src
On Fri, Feb 25, 2011 at 04:38:54PM +0200, Antti Kantee wrote: On Fri Feb 25 2011 at 15:19:30 +0100, Joerg Sonnenberger wrote: I get time outs for stress_long and stress_short (rump/rumpkern/t_sp). Those are because of, from what I could tell, this: 0xbbbd45c5 fcntl+21: mov%gs:0x0,%edi == segfault Notably, those tests exercise threads and processes more heavily than any other test we have: they create 256 concurrent racing threads over several processes which are killed and recreated. Are you sure about that? libpthread should be the only thing (before the back out) that touches %gs and the kernel is normally using %fs for CPU local memory. Joerg
re: CVS commit: src/usr.sbin/pcictl
Module Name: src Committed By: jmcneill Date: Fri Feb 25 13:50:18 UTC 2011 Modified Files: src/usr.sbin/pcictl: pcictl.8 Log Message: Today I learned that 'pcictl pci0 list -b -1' lists devices on all busses. isn't this already documented? PCI bus specified on the command line. Any other locator not specified defaults to a wildcard, or may be explicitly wildcarded by specifying ``any''. i agree having an explicit example is better, but could you make it use any instead of -1? thanks. .mrg.
Re: CVS commit: src/sys/net80211
On 25.02.11 17:15, David Young wrote: On Fri, Feb 25, 2011 at 08:01:50AM +, Christoph Egger wrote: Module Name: src Committed By:cegger Date:Fri Feb 25 08:01:49 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: sync with FreeBSD rev 1.11. No binary changes. Careful: NetBSD follows the standard, http://www.radiotap.net/defined-fields, and field 18 has not been standardized. Please back out this change (and all of the subsequent changes) and send a patch for review to tech-net. Do you mean that bit field or the whole revision ? Christoph
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 09:16:00 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.h acpi_cpu_pstate.c
Log Message:
Add preliminary support for the IA32_APERF and IA32_MPERF frequency counters.
These are not yet used for anything and only Intel is supported at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/acpi/acpi_cpu_pstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.40 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.41
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.40 Thu Feb 24 13:19:36 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Feb 25 09:16:00 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.40 2011/02/24 13:19:36 jmcneill Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.41 2011/02/25 09:16:00 jruoho Exp $ */
/*-
- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
+ * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.40 2011/02/24 13:19:36 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.41 2011/02/25 09:16:00 jruoho Exp $);
#include sys/param.h
#include sys/bus.h
@@ -99,6 +99,8 @@
void (*native_idle)(void) = NULL;
static int acpicpu_md_quirks_piix4(struct pci_attach_args *);
+static void acpicpu_md_pstate_percent_reset(struct acpicpu_softc *);
+static void acpicpu_md_pstate_percent_status(void *, void *);
static void acpicpu_md_pstate_status(void *, void *);
static int acpicpu_md_pstate_fidvid_get(struct acpicpu_softc *,
uint32_t *);
@@ -408,16 +410,22 @@
}
int
-acpicpu_md_pstate_start(void)
+acpicpu_md_pstate_start(struct acpicpu_softc *sc)
{
const uint64_t est = __BIT(16);
uint64_t val;
+ if ((sc-sc_flags ACPICPU_FLAG_P) == 0)
+ return ENODEV;
+
switch (cpu_vendor) {
case CPUVENDOR_IDT:
case CPUVENDOR_INTEL:
+ /*
+ * Make sure EST is enabled.
+ */
val = rdmsr(MSR_MISC_ENABLE);
if ((val est) == 0) {
@@ -430,6 +438,12 @@
if ((val est) == 0)
return ENOTTY;
}
+
+ /*
+ * Reset the APERF and MPERF counters.
+ */
+ if ((sc-sc_flags ACPICPU_FLAG_P_HW) != 0)
+ acpicpu_md_pstate_percent_reset(sc);
}
return acpicpu_md_pstate_sysctl_init();
@@ -549,6 +563,80 @@
return 0;
}
+/*
+ * Returns the percentage of the actual frequency in
+ * terms of the maximum frequency of the calling CPU
+ * since the last call. A value zero implies an error.
+ */
+uint8_t
+acpicpu_md_pstate_percent(struct acpicpu_softc *sc)
+{
+ struct cpu_info *ci = sc-sc_ci;
+ uint64_t aperf, mperf;
+ uint64_t xc, rv = 0;
+
+ if (__predict_false((sc-sc_flags ACPICPU_FLAG_P) == 0))
+ return 0;
+
+ if (__predict_false((sc-sc_flags ACPICPU_FLAG_P_HW) == 0))
+ return 0;
+
+ /*
+ * Read the IA32_APERF and IA32_MPERF counters. The first
+ * increments at the rate of the fixed maximum frequency
+ * configured during the boot, whereas APERF counts at the
+ * rate of the actual frequency. Note that the MSRs must be
+ * read without delay, and that only the ratio between
+ * IA32_APERF and IA32_MPERF is architecturally defined.
+ *
+ * For further details, refer to:
+ *
+ * Intel Corporation: Intel 64 and IA-32 Architectures
+ * Software Developer's Manual. Section 13.2, Volume 3A:
+ * System Programming Guide, Part 1. July, 2008.
+ */
+ x86_disable_intr();
+
+ aperf = sc-sc_pstate_aperf;
+ mperf = sc-sc_pstate_mperf;
+
+ xc = xc_unicast(0, acpicpu_md_pstate_percent_status, sc, NULL, ci);
+ xc_wait(xc);
+
+ x86_enable_intr();
+
+ aperf = sc-sc_pstate_aperf - aperf;
+ mperf = sc-sc_pstate_mperf - mperf;
+
+ if (__predict_true(mperf != 0))
+ rv = (aperf * 100) / mperf;
+
+ return rv;
+}
+
+static void
+acpicpu_md_pstate_percent_status(void *arg1, void *arg2)
+{
+ struct acpicpu_softc *sc = arg1;
+
+ sc-sc_pstate_aperf = rdmsr(MSR_APERF);
+ sc-sc_pstate_mperf = rdmsr(MSR_MPERF);
+}
+
+static void
+acpicpu_md_pstate_percent_reset(struct acpicpu_softc *sc)
+{
+
+ KASSERT((sc-sc_flags ACPICPU_FLAG_P) != 0);
+ KASSERT((sc-sc_flags ACPICPU_FLAG_P_HW) != 0);
+
+ wrmsr(MSR_APERF, 0);
+ wrmsr(MSR_MPERF, 0);
+
+ sc-sc_pstate_aperf = 0;
+ sc-sc_pstate_mperf = 0;
+}
+
int
acpicpu_md_pstate_get(struct acpicpu_softc *sc, uint32_t *freq)
{
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.29 src/sys/dev/acpi/acpi_cpu.h:1.30
--- src/sys/dev/acpi/acpi_cpu.h:1.29 Fri Feb 25 06:18:02 2011
+++ src/sys/dev/acpi/acpi_cpu.h Fri Feb 25 09:16:00 2011
@@
CVS commit: src/sys/compat/darwin
Module Name:src Committed By: kiyohara Date: Fri Feb 25 09:54:23 UTC 2011 Modified Files: src/sys/compat/darwin: darwin_exec.c Log Message: Fix build failed. Need separator `,'. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/compat/darwin/darwin_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/darwin/darwin_exec.c diff -u src/sys/compat/darwin/darwin_exec.c:1.61 src/sys/compat/darwin/darwin_exec.c:1.62 --- src/sys/compat/darwin/darwin_exec.c:1.61 Wed Jul 7 01:30:32 2010 +++ src/sys/compat/darwin/darwin_exec.c Fri Feb 25 09:54:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_exec.c,v 1.61 2010/07/07 01:30:32 chs Exp $ */ +/* $NetBSD: darwin_exec.c,v 1.62 2011/02/25 09:54:23 kiyohara Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include opt_compat_darwin.h /* For COMPAT_DARWIN in mach_port.h */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: darwin_exec.c,v 1.61 2010/07/07 01:30:32 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: darwin_exec.c,v 1.62 2011/02/25 09:54:23 kiyohara Exp $); #include opt_syscall_debug.h #include wsdisplay.h @@ -95,7 +95,7 @@ .e_path = /emul/darwin, #ifndef __HAVE_MINIMAL_EMUL .e_flags = 0, - .e_errno = NULL + .e_errno = NULL, .e_nosys = DARWIN_SYS_syscall, .e_nsysent = DARWIN_SYS_NSYSENT, #endif
CVS commit: src/sys/arch/bebox/stand
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:06:24 UTC 2011 Modified Files: src/sys/arch/bebox/stand: README Log Message: Update description to latest boot. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/bebox/stand/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/bebox/stand/README diff -u src/sys/arch/bebox/stand/README:1.3 src/sys/arch/bebox/stand/README:1.4 --- src/sys/arch/bebox/stand/README:1.3 Sun May 25 16:21:07 2008 +++ src/sys/arch/bebox/stand/README Fri Feb 25 10:06:24 2011 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.3 2008/05/25 16:21:07 kiyohara Exp $ +$NetBSD: README,v 1.4 2011/02/25 10:06:24 kiyohara Exp $ contents boot: NetBSD/bebox booter. @@ -21,20 +21,20 @@ if change CPPFLAGS after make, use 'make cleandir' before 'make'. - boot can read/exec kernel on ffs(floppy disk), cd9660(floppy disk), - attached image by powerpc's mkimageboot. - + boot can read/exec kernel on ffs(floppy/ide/scsi) or attached + in-kernel image by powerpc's mkbootimage. Example of making bootable floppy disk: - % cd /sys/arch/bebox/stand + % cd sys/arch/bebox/stand % $(TOOLDIR)/bin/nbmake-bebox - % gzip -c ../compile/GENERIC/netbsd /tmp/netbsd.gz - % elf2pef/elf2pef boot/boot /tmp/boot.pef /tmp/netbsd.gz - [insert formatted floppy disk] - % mkbootimage/mkbootimage /tmp/boot.pef /dev/rfd0a - % powerpc-mkbootimage -m bebox -b boot/boot \ - -k ../compile/GENERIC/netbsd /tmp/fd.img - % dd if=/tmp/fd.img of=/dev/rfd0a + % nbpowerpc-mkbootimage -I -m bebox -b boot/boot /tmp/fd.img + + Or + % nbpowerpc-mkbootimage -m bebox -b boot/boot \ + -k ../compile/INSTALL/netbsd /tmp/fd.img + + [insert formatted floppy disk] + % dd if=/tmp/fd.img of=/dev/rfd0a
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src
Committed By: kiyohara
Date: Fri Feb 25 10:12:44 UTC 2011
Modified Files:
src/sys/arch/bebox/stand/boot: prf.c tgets.c
Log Message:
Style.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/bebox/stand/boot/prf.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/bebox/stand/boot/tgets.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/stand/boot/prf.c
diff -u src/sys/arch/bebox/stand/boot/prf.c:1.9 src/sys/arch/bebox/stand/boot/prf.c:1.10
--- src/sys/arch/bebox/stand/boot/prf.c:1.9 Wed Mar 18 10:22:27 2009
+++ src/sys/arch/bebox/stand/boot/prf.c Fri Feb 25 10:12:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: prf.c,v 1.9 2009/03/18 10:22:27 cegger Exp $ */
+/* $NetBSD: prf.c,v 1.10 2011/02/25 10:12:44 kiyohara Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -35,11 +35,13 @@
void
putchar(int c)
{
+
cnputc(c);
}
int
getchar(void)
{
- return (cngetc());
+
+ return cngetc();
}
Index: src/sys/arch/bebox/stand/boot/tgets.c
diff -u src/sys/arch/bebox/stand/boot/tgets.c:1.7 src/sys/arch/bebox/stand/boot/tgets.c:1.8
--- src/sys/arch/bebox/stand/boot/tgets.c:1.7 Sat Mar 14 15:36:04 2009
+++ src/sys/arch/bebox/stand/boot/tgets.c Fri Feb 25 10:12:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tgets.c,v 1.7 2009/03/14 15:36:04 dsl Exp $ */
+/* $NetBSD: tgets.c,v 1.8 2011/02/25 10:12:44 kiyohara Exp $ */
/*-
* Copyright (c) 1993
@@ -50,7 +50,7 @@
goto next;
delay(SCANWAIT);
}
- return (-1);
+ return -1;
next:
#else
c = getchar();
@@ -71,7 +71,7 @@
putchar('\b');
}
break;
- case 'r'037: {
+ case 'r' 037: {
register char *p;
putchar('\n');
@@ -79,8 +79,8 @@
putchar(*p);
break;
}
- case 'u'037:
- case 'w'037:
+ case 'u' 037:
+ case 'w' 037:
lp = buf;
putchar('\n');
break;
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:16:59 UTC 2011 Modified Files: src/sys/arch/evbppc/obs405: obs600_autoconf.c Log Message: Fix UIC cascading. UIC1 to IRQ 30, UIC2 to 28. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/obs405/obs600_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.1 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.2 --- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.1 Thu Mar 18 14:15:38 2010 +++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Fri Feb 25 10:16:59 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_autoconf.c,v 1.1 2010/03/18 14:15:38 kiyohara Exp $ */ +/* $NetBSD: obs600_autoconf.c,v 1.2 2011/02/25 10:16:59 kiyohara Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,7 +33,7 @@ * DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obs600_autoconf.c,v 1.1 2010/03/18 14:15:38 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: obs600_autoconf.c,v 1.2 2011/02/25 10:16:59 kiyohara Exp $); #include sys/systm.h #include sys/device.h @@ -56,8 +56,8 @@ /* Initialize intr and add UICs */ intr_init(); - uic_add(DCR_UIC1_BASE, 28); /* UIC1 cascade to irq 28 */ - uic_add(DCR_UIC2_BASE, 30); /* UIC2 cascade to irq 30 */ + uic_add(DCR_UIC1_BASE, 30); /* UIC1 cascade to irq 30 */ + uic_add(DCR_UIC2_BASE, 28); /* UIC2 cascade to irq 28 */ calc_delayconst();
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:18:09 UTC 2011 Modified Files: src/sys/arch/evbppc/obs405: obs600_machdep.c Log Message: Need splraise(-1) here. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/obs405/obs600_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/obs405/obs600_machdep.c diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.2 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.3 --- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.2 Mon Dec 20 00:25:32 2010 +++ src/sys/arch/evbppc/obs405/obs600_machdep.c Fri Feb 25 10:18:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_machdep.c,v 1.2 2010/12/20 00:25:32 matt Exp $ */ +/* $NetBSD: obs600_machdep.c,v 1.3 2011/02/25 10:18:09 kiyohara Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.2 2010/12/20 00:25:32 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.3 2011/02/25 10:18:09 kiyohara Exp $); #include opt_compat_netbsd.h #include opt_ddb.h @@ -290,6 +290,8 @@ * no fake mapiodev */ fake_mapiodev = 0; + + splraise(-1); } /*
CVS commit: src/sys/net80211
Module Name:src Committed By: tron Date: Fri Feb 25 10:45:57 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: Remove duplicate definitions which break the build. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211_radiotap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net80211/ieee80211_radiotap.h diff -u src/sys/net80211/ieee80211_radiotap.h:1.23 src/sys/net80211/ieee80211_radiotap.h:1.24 --- src/sys/net80211/ieee80211_radiotap.h:1.23 Fri Feb 25 08:04:18 2011 +++ src/sys/net80211/ieee80211_radiotap.h Fri Feb 25 10:45:57 2011 @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.11 2007/12/13 01:23:40 sam Exp $ */ -/* $NetBSD: ieee80211_radiotap.h,v 1.23 2011/02/25 08:04:18 cegger Exp $ */ +/* $NetBSD: ieee80211_radiotap.h,v 1.24 2011/02/25 10:45:57 tron Exp $ */ /*- * Copyright (c) 2003, 2004 David Young. All rights reserved. @@ -211,22 +211,6 @@ IEEE80211_RADIOTAP_EXT = 31 }; -#ifndef _KERNEL -/* Channel flags. */ -#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */ -#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */ -#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */ -#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */ -#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */ -#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */ -#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */ -#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */ -#define IEEE80211_CHAN_GSM 0x1000 /* 900 MHz spectrum channel */ -#define IEEE80211_CHAN_STURBO 0x2000 /* 11a static turbo channel only */ -#define IEEE80211_CHAN_HALF 0x4000 /* Half rate channel */ -#define IEEE80211_CHAN_QUARTER 0x8000 /* Quarter rate channel */ -#endif /* !_KERNEL */ - /* For IEEE80211_RADIOTAP_FLAGS */ #define IEEE80211_RADIOTAP_F_CFP 0x01 /* sent/received * during CFP
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 10:59:32 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Add support for APERF and MPERF on AMD processors.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x86/acpi/acpi_cpu_md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.41 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.42
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.41 Fri Feb 25 09:16:00 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Feb 25 10:59:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.41 2011/02/25 09:16:00 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.42 2011/02/25 10:59:32 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.41 2011/02/25 09:16:00 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.42 2011/02/25 10:59:32 jruoho Exp $);
#include sys/param.h
#include sys/bus.h
@@ -278,6 +278,11 @@
case 0x14: /* AMD Fusion */
+ /*
+ * Like with Intel, detect invariant TSC,
+ * MSR-based P-states, and AMD's turbo
+ * (Core Performance Boost), respectively.
+ */
if ((regs[3] CPUID_APM_TSC) != 0)
val = ~ACPICPU_FLAG_C_TSC;
@@ -287,6 +292,18 @@
if ((regs[3] CPUID_APM_CPB) != 0)
val |= ACPICPU_FLAG_P_TURBO;
+ /*
+ * Also check for APERF and MPERF,
+ * first available in the family 10h.
+ */
+ if (cpuid_level = 0x06) {
+
+x86_cpuid(0x0006, regs);
+
+if ((regs[2] __BIT(0)) != 0)
+ val |= ACPICPU_FLAG_P_HW;
+ }
+
break;
}
@@ -438,14 +455,14 @@
if ((val est) == 0)
return ENOTTY;
}
-
- /*
- * Reset the APERF and MPERF counters.
- */
- if ((sc-sc_flags ACPICPU_FLAG_P_HW) != 0)
- acpicpu_md_pstate_percent_reset(sc);
}
+ /*
+ * Reset the APERF and MPERF counters.
+ */
+ if ((sc-sc_flags ACPICPU_FLAG_P_HW) != 0)
+ acpicpu_md_pstate_percent_reset(sc);
+
return acpicpu_md_pstate_sysctl_init();
}
@@ -594,6 +611,10 @@
* Intel Corporation: Intel 64 and IA-32 Architectures
* Software Developer's Manual. Section 13.2, Volume 3A:
* System Programming Guide, Part 1. July, 2008.
+ *
+ * Advanced Micro Devices: BIOS and Kernel Developer's
+ * Guide (BKDG) for AMD Family 10h Processors. Section
+ * 2.4.5, Revision 3.48, April 2010.
*/
x86_disable_intr();
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: tsutsui Date: Fri Feb 25 11:44:56 UTC 2011 Modified Files: src/sys/arch/mips/mips: fp.S Log Message: Fix cvt.d.s per analysis by Marcus Comstedt in PR port-mips/36251. Confirmed on ews4800mips. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mips/mips/fp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/fp.S diff -u src/sys/arch/mips/mips/fp.S:1.39 src/sys/arch/mips/mips/fp.S:1.40 --- src/sys/arch/mips/mips/fp.S:1.39 Thu Feb 24 16:49:15 2011 +++ src/sys/arch/mips/mips/fp.S Fri Feb 25 11:44:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fp.S,v 1.39 2011/02/24 16:49:15 tsutsui Exp $ */ +/* $NetBSD: fp.S,v 1.40 2011/02/25 11:44:56 tsutsui Exp $ */ /* * Copyright (c) 1992, 1993 @@ -1827,6 +1827,8 @@ beq t2, zero, result_fs_d # is FS zero? jal _C_LABEL(renorm_fs_s) move t9, zero + sll t3, t2, 32 - 3 # convert S fraction to D + srl t2, t2, 3 b norm_d 2: addu t1, t1, DEXP_BIAS - SEXP_BIAS # bias exponent correctly
CVS commit: src/lib/libc/arch/mips/softfloat
Module Name:src Committed By: pooka Date: Fri Feb 25 11:53:07 UTC 2011 Modified Files: src/lib/libc/arch/mips/softfloat: mips-gcc.h Log Message: Fix LE softfloat (mostly theoretical) and comment. from Alessandro Forin To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/mips/softfloat/mips-gcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/softfloat/mips-gcc.h diff -u src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.2 src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.3 --- src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.2 Mon Dec 14 01:07:42 2009 +++ src/lib/libc/arch/mips/softfloat/mips-gcc.h Fri Feb 25 11:53:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mips-gcc.h,v 1.2 2009/12/14 01:07:42 matt Exp $ */ +/* $NetBSD: mips-gcc.h,v 1.3 2011/02/25 11:53:07 pooka Exp $ */ /* --- @@ -85,11 +85,16 @@ /* --- -The ARM FPA is odd in that it stores doubles high-order word first, no matter +The MIPS FPA is odd in that it stores doubles high-order word first, no matter what the endianness of the CPU. VFP is sane. --- */ #if defined(SOFTFLOAT_FOR_GCC) -#define FLOAT64_DEMANGLE(a) (a) -#define FLOAT64_MANGLE(a) (a) +#if defined(__MIPSEB__) +#define FLOAT64_DEMANGLE(a) (a) +#define FLOAT64_MANGLE(a) (a) +#else +#define FLOAT64_DEMANGLE(a) (((a) 32) | ((a) 32)) +#define FLOAT64_MANGLE(a) FLOAT64_DEMANGLE(a) +#endif #endif
CVS commit: src/lib/libc/arch/mips/softfloat
Module Name:src Committed By: pooka Date: Fri Feb 25 11:55:28 UTC 2011 Modified Files: src/lib/libc/arch/mips/softfloat: mips-gcc.h Log Message: fix my whitespace copypaste To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/mips/softfloat/mips-gcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/softfloat/mips-gcc.h diff -u src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.3 src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.4 --- src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.3 Fri Feb 25 11:53:07 2011 +++ src/lib/libc/arch/mips/softfloat/mips-gcc.h Fri Feb 25 11:55:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mips-gcc.h,v 1.3 2011/02/25 11:53:07 pooka Exp $ */ +/* $NetBSD: mips-gcc.h,v 1.4 2011/02/25 11:55:28 pooka Exp $ */ /* --- @@ -91,10 +91,10 @@ */ #if defined(SOFTFLOAT_FOR_GCC) #if defined(__MIPSEB__) -#define FLOAT64_DEMANGLE(a) (a) -#define FLOAT64_MANGLE(a) (a) +#define FLOAT64_DEMANGLE(a) (a) +#define FLOAT64_MANGLE(a) (a) #else -#define FLOAT64_DEMANGLE(a) (((a) 32) | ((a) 32)) -#define FLOAT64_MANGLE(a) FLOAT64_DEMANGLE(a) +#define FLOAT64_DEMANGLE(a) (((a) 32) | ((a) 32)) +#define FLOAT64_MANGLE(a) FLOAT64_DEMANGLE(a) #endif #endif
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 12:08:35 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c
Log Message:
Rename couple of badly named functions for consistency. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/acpi/acpi_cpu_cstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.42 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.43
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.42 Fri Feb 25 10:59:32 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Feb 25 12:08:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.42 2011/02/25 10:59:32 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.43 2011/02/25 12:08:35 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.42 2011/02/25 10:59:32 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.43 2011/02/25 12:08:35 jruoho Exp $);
#include sys/param.h
#include sys/bus.h
@@ -98,7 +98,7 @@
static char native_idle_text[16];
void (*native_idle)(void) = NULL;
-static int acpicpu_md_quirks_piix4(struct pci_attach_args *);
+static int acpicpu_md_quirk_piix4(struct pci_attach_args *);
static void acpicpu_md_pstate_percent_reset(struct acpicpu_softc *);
static void acpicpu_md_pstate_percent_status(void *, void *);
static void acpicpu_md_pstate_status(void *, void *);
@@ -153,7 +153,7 @@
}
uint32_t
-acpicpu_md_quirks(void)
+acpicpu_md_flags(void)
{
struct cpu_info *ci = curcpu();
struct pci_attach_args pa;
@@ -313,14 +313,14 @@
/*
* There are several erratums for PIIX4.
*/
- if (pci_find_device(pa, acpicpu_md_quirks_piix4) != 0)
+ if (pci_find_device(pa, acpicpu_md_quirk_piix4) != 0)
val |= ACPICPU_FLAG_PIIX4;
return val;
}
static int
-acpicpu_md_quirks_piix4(struct pci_attach_args *pa)
+acpicpu_md_quirk_piix4(struct pci_attach_args *pa)
{
/*
@@ -339,7 +339,7 @@
}
void
-acpicpu_md_quirks_c1e(void)
+acpicpu_md_quirk_c1e(void)
{
const uint64_t c1e = MSR_CMPHALT_SMI | MSR_CMPHALT_C1E;
uint64_t val;
@@ -351,7 +351,7 @@
}
int
-acpicpu_md_idle_start(struct acpicpu_softc *sc)
+acpicpu_md_cstate_start(struct acpicpu_softc *sc)
{
const size_t size = sizeof(native_idle_text);
struct acpicpu_cstate *cs;
@@ -376,7 +376,7 @@
}
int
-acpicpu_md_idle_stop(void)
+acpicpu_md_cstate_stop(void)
{
uint64_t xc;
bool ipi;
@@ -399,7 +399,7 @@
* Caller should enable interrupts after return.
*/
void
-acpicpu_md_idle_enter(int method, int state)
+acpicpu_md_cstate_enter(int method, int state)
{
struct cpu_info *ci = curcpu();
Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.27 src/sys/dev/acpi/acpi_cpu.c:1.28
--- src/sys/dev/acpi/acpi_cpu.c:1.27 Fri Feb 25 06:18:02 2011
+++ src/sys/dev/acpi/acpi_cpu.c Fri Feb 25 12:08:35 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_cpu.c,v 1.27 2011/02/25 06:18:02 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.28 2011/02/25 12:08:35 jruoho Exp $ */
/*-
- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
+ * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.27 2011/02/25 06:18:02 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.28 2011/02/25 12:08:35 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -145,7 +145,7 @@
acpicpu_sc[id] = sc;
sc-sc_cap = acpicpu_cap(sc);
- sc-sc_flags |= acpicpu_md_quirks();
+ sc-sc_flags |= acpicpu_md_flags();
mutex_init(sc-sc_mtx, MUTEX_DEFAULT, IPL_NONE);
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.30 src/sys/dev/acpi/acpi_cpu.h:1.31
--- src/sys/dev/acpi/acpi_cpu.h:1.30 Fri Feb 25 09:16:00 2011
+++ src/sys/dev/acpi/acpi_cpu.h Fri Feb 25 12:08:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.30 2011/02/25 09:16:00 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.31 2011/02/25 12:08:35 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -236,11 +236,11 @@
int acpicpu_tstate_set(struct acpicpu_softc *, uint32_t);
uint32_t acpicpu_md_cap(void);
-uint32_t acpicpu_md_quirks(void);
-void acpicpu_md_quirks_c1e(void);
-int acpicpu_md_idle_start(struct acpicpu_softc *);
-int acpicpu_md_idle_stop(void);
-void acpicpu_md_idle_enter(int, int);
+uint32_t acpicpu_md_flags(void);
+void
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Fri Feb 25 12:15:32 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: Bump to 5.99.47 for TLS changes. To generate a diff of this commit: cvs rdiff -u -r1.382 -r1.383 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.382 src/sys/sys/param.h:1.383 --- src/sys/sys/param.h:1.382 Sat Feb 19 09:54:01 2011 +++ src/sys/sys/param.h Fri Feb 25 12:15:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.382 2011/02/19 09:54:01 jruoho Exp $ */ +/* $NetBSD: param.h,v 1.383 2011/02/25 12:15:32 joerg Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599004600 /* NetBSD 5.99.46 */ +#define __NetBSD_Version__ 599004700 /* NetBSD 5.99.46 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Fri Feb 25 12:41:51 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Remove the last reference to #ifdef a.k.a. options(4) POWERNOW_K8. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/acpicpu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.23 src/share/man/man4/acpicpu.4:1.24 --- src/share/man/man4/acpicpu.4:1.23 Thu Feb 24 11:33:41 2011 +++ src/share/man/man4/acpicpu.4 Fri Feb 25 12:41:51 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.23 2011/02/24 11:33:41 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.24 2011/02/25 12:41:51 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 24, 2011 +.Dd February 25, 2011 .Dt ACPICPU 4 .Os .Sh NAME @@ -316,7 +316,7 @@ The P-state support provided by .Xr est 4 and -.Dv POWERNOW_K8 +.Xr powernow 8 are known to be either problematic or entirely dysfunctional with new x86 processors. .Sh SEE ALSO
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Fri Feb 25 13:29:46 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: Fix redundant version. To generate a diff of this commit: cvs rdiff -u -r1.383 -r1.384 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.383 src/sys/sys/param.h:1.384 --- src/sys/sys/param.h:1.383 Fri Feb 25 12:15:32 2011 +++ src/sys/sys/param.h Fri Feb 25 13:29:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.383 2011/02/25 12:15:32 joerg Exp $ */ +/* $NetBSD: param.h,v 1.384 2011/02/25 13:29:46 joerg Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599004700 /* NetBSD 5.99.46 */ +#define __NetBSD_Version__ 599004700 /* NetBSD 5.99.47 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/usr.sbin/pcictl
Module Name:src Committed By: jmcneill Date: Fri Feb 25 13:50:18 UTC 2011 Modified Files: src/usr.sbin/pcictl: pcictl.8 Log Message: Today I learned that 'pcictl pci0 list -b -1' lists devices on all busses. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/pcictl/pcictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/pcictl/pcictl.8 diff -u src/usr.sbin/pcictl/pcictl.8:1.7 src/usr.sbin/pcictl/pcictl.8:1.8 --- src/usr.sbin/pcictl/pcictl.8:1.7 Mon Mar 9 19:24:33 2009 +++ src/usr.sbin/pcictl/pcictl.8 Fri Feb 25 13:50:18 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcictl.8,v 1.7 2009/03/09 19:24:33 joerg Exp $ +.\ $NetBSD: pcictl.8,v 1.8 2011/02/25 13:50:18 jmcneill Exp $ .\ .\ Copyright 2001 Wasabi Systems, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 29, 2007 +.Dd February 25, 2011 .Dt PCICTL 8 .Os .Sh NAME @@ -67,6 +67,7 @@ numbers may be specified by flags. If the bus is not specified, it defaults to the bus number of the PCI bus specified on the command line. +If the bus is -1, devices on all busses are listed. Any other locator not specified defaults to a wildcard, or may be explicitly wildcarded by specifying .Dq any .
CVS commit: src/sys/arch
Module Name:src
Committed By: joerg
Date: Fri Feb 25 14:07:14 UTC 2011
Modified Files:
src/sys/arch/alpha/include: mcontext.h
src/sys/arch/amd64/include: mcontext.h
src/sys/arch/hppa/include: mcontext.h
src/sys/arch/i386/include: mcontext.h
src/sys/arch/mips/include: mcontext.h
src/sys/arch/powerpc/include: mcontext.h
src/sys/arch/sh3/include: mcontext.h
src/sys/arch/sparc/include: mcontext.h
Log Message:
Be nicer to software that insists on -ansi and use __inline.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/include/mcontext.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/mcontext.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/mcontext.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/include/mcontext.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/include/mcontext.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/include/mcontext.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sh3/include/mcontext.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/include/mcontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/mcontext.h
diff -u src/sys/arch/alpha/include/mcontext.h:1.6 src/sys/arch/alpha/include/mcontext.h:1.7
--- src/sys/arch/alpha/include/mcontext.h:1.6 Thu Feb 24 04:28:44 2011
+++ src/sys/arch/alpha/include/mcontext.h Fri Feb 25 14:07:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.6 2011/02/24 04:28:44 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.7 2011/02/25 14:07:12 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
#define _UC_MACHINE_SET_PC(uc, pc) _UC_MACHINE_PC(uc) = (pc)
-static inline void *
+static __inline void *
__lwp_getprivate_fast(void)
{
register void *__tmp __asm($0);
Index: src/sys/arch/amd64/include/mcontext.h
diff -u src/sys/arch/amd64/include/mcontext.h:1.13 src/sys/arch/amd64/include/mcontext.h:1.14
--- src/sys/arch/amd64/include/mcontext.h:1.13 Thu Feb 24 04:28:44 2011
+++ src/sys/arch/amd64/include/mcontext.h Fri Feb 25 14:07:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.13 2011/02/24 04:28:44 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.14 2011/02/25 14:07:12 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
#define __UCONTEXT_SIZE 784
-static inline void *
+static __inline void *
__lwp_getprivate_fast(void)
{
void *__tmp;
Index: src/sys/arch/hppa/include/mcontext.h
diff -u src/sys/arch/hppa/include/mcontext.h:1.5 src/sys/arch/hppa/include/mcontext.h:1.6
--- src/sys/arch/hppa/include/mcontext.h:1.5 Thu Feb 24 04:28:45 2011
+++ src/sys/arch/hppa/include/mcontext.h Fri Feb 25 14:07:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.5 2011/02/24 04:28:45 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.6 2011/02/25 14:07:12 joerg Exp $ */
#ifndef _HPPA_MCONTEXT_H_
#define _HPPA_MCONTEXT_H_
@@ -57,7 +57,7 @@
(uc)-uc_mcontext.__gregs[_REG_PCOQT] = (pc) + 4; \
} while (/*CONSTCOND*/0)
-static inline void *
+static __inline void *
__lwp_getprivate_fast(void)
{
register void *__tmp;
Index: src/sys/arch/i386/include/mcontext.h
diff -u src/sys/arch/i386/include/mcontext.h:1.9 src/sys/arch/i386/include/mcontext.h:1.10
--- src/sys/arch/i386/include/mcontext.h:1.9 Thu Feb 24 04:28:46 2011
+++ src/sys/arch/i386/include/mcontext.h Fri Feb 25 14:07:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.9 2011/02/24 04:28:46 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.10 2011/02/25 14:07:13 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -127,7 +127,7 @@
#define __UCONTEXT_SIZE 776
-static inline void *
+static __inline void *
__lwp_getprivate_fast(void)
{
void *__tmp;
Index: src/sys/arch/mips/include/mcontext.h
diff -u src/sys/arch/mips/include/mcontext.h:1.15 src/sys/arch/mips/include/mcontext.h:1.16
--- src/sys/arch/mips/include/mcontext.h:1.15 Thu Feb 24 04:28:47 2011
+++ src/sys/arch/mips/include/mcontext.h Fri Feb 25 14:07:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.15 2011/02/24 04:28:47 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.16 2011/02/25 14:07:13 joerg Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -187,7 +187,7 @@
#endif
#ifndef __ASSEMBLER__
-static inline void *
+static __inline void *
__lwp_getprivate_fast(void)
{
register void *__tcb;
Index: src/sys/arch/powerpc/include/mcontext.h
diff -u src/sys/arch/powerpc/include/mcontext.h:1.11 src/sys/arch/powerpc/include/mcontext.h:1.12
--- src/sys/arch/powerpc/include/mcontext.h:1.11 Thu Feb 24 04:28:47 2011
+++ src/sys/arch/powerpc/include/mcontext.h Fri Feb 25 14:07:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.11 2011/02/24 04:28:47 joerg Exp $ */
+/* $NetBSD: mcontext.h,v 1.12 2011/02/25 14:07:13 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -122,7 +122,7 @@
CVS commit: src/usr.sbin/pcictl
Module Name:src Committed By: wiz Date: Fri Feb 25 14:11:25 UTC 2011 Modified Files: src/usr.sbin/pcictl: pcictl.8 Log Message: Add quoting for minus, for PostScript output. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/pcictl/pcictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/pcictl/pcictl.8 diff -u src/usr.sbin/pcictl/pcictl.8:1.8 src/usr.sbin/pcictl/pcictl.8:1.9 --- src/usr.sbin/pcictl/pcictl.8:1.8 Fri Feb 25 13:50:18 2011 +++ src/usr.sbin/pcictl/pcictl.8 Fri Feb 25 14:11:25 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcictl.8,v 1.8 2011/02/25 13:50:18 jmcneill Exp $ +.\ $NetBSD: pcictl.8,v 1.9 2011/02/25 14:11:25 wiz Exp $ .\ .\ Copyright 2001 Wasabi Systems, Inc. .\ All rights reserved. @@ -67,7 +67,7 @@ numbers may be specified by flags. If the bus is not specified, it defaults to the bus number of the PCI bus specified on the command line. -If the bus is -1, devices on all busses are listed. +If the bus is \-1, devices on all busses are listed. Any other locator not specified defaults to a wildcard, or may be explicitly wildcarded by specifying .Dq any .
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: tsutsui Date: Fri Feb 25 14:57:45 UTC 2011 Modified Files: src/sys/arch/mips/mips: spl.S Log Message: Uncomment clear SOFT_INT bits lines in _splsw_spl0(). This makes interrupts on cobalt (and probably other Rm5200 machines) work, and no bad side effect seen on R4400 ews4800mips. Cobalt GENERIC kernel on RaQ still panics right after mountroot() though: --- : atabus1 at viaide0 channel 1 VIA Technologies VT83C572 USB Controller (USB serial bus, revision 0x02) at pci0 dev 9 function 2 not configured wd0 at atabus0 drive 0 wd0: QUANTUM FIREBALLlct15 15 wd0: 14324 MB, 29104 cyl, 16 head, 63 sec, 512 bytes/sect x 29336832 sectors boot device: wd0 root on wd0a dumps on wd0b root file system type: ffs pid 1(init): ABI set to O32 (e_flags=0x1007) pid 4(sh): trap: cpu0, address error (load or I-fetch) in kernel mode status=0x8003, cause=0x10, epc=0x801430a0, vaddr=0x8001 tf=0xc6471a88 ksp=0xc6471b28 ra=0x801f0c90 ppl=0x801f0c24 kernel: address error (load or I-fetch) trap Stopped in pid 4.1 (sh) at netbsd:mutex_abort: lw v1,0(a0) db tr 0xc6471b28: mutex_abort+0 (8001,80380530,803cbb10,803ff840) ra 801f0c90 sz 0 0xc6471b28: mips_pmap_map_poolpage+90 (8001,80380530,803cbb10,803ff840) ra 80276788 sz 40 0xc6471b50: pool_grow+4c (8001,80380530,803cbb10,803ff840) ra 80276b64 sz 48 0xc6471b80: pool_catchup+34 (8001,80380530,803cbb10,803ff840) ra 80276418 sz 24 0xc6471b98: pool_get+50c (8001,80380530,803cbb10,803ff840) ra 801f11b8 sz 64 0xc6471bd8: pmap_enter_pv+e8 (8001,80380530,803cbb10,803ff840) ra 801f3054 sz 48 0xc6471c08: pmap_enter+138 (8001,80380530,803cbb10,803ff840) ra 802fd528 sz 64 0xc6471c48: uvm_fault_lower+24c (8001,80380530,803cbb10,803ff840) ra 802fec50 sz 96 0xc6471ca8: uvm_fault_internal+72c (83ed5b40,80380530,1,0) ra 802b5b08 sz 272 0xc6471db8: trap+8d0 (10,8,1,408fb8) ra 8018f22c sz 400 0xc6471f48: mips3_user_gen_exception+cc (10,8,1,408fb8) ra 0 sz 0 User-level: pid 4.1 db To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/spl.S diff -u src/sys/arch/mips/mips/spl.S:1.2 src/sys/arch/mips/mips/spl.S:1.3 --- src/sys/arch/mips/mips/spl.S:1.2 Sun Feb 20 07:45:48 2011 +++ src/sys/arch/mips/mips/spl.S Fri Feb 25 14:57:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.2 2011/02/20 07:45:48 matt Exp $ */ +/* $NetBSD: spl.S,v 1.3 2011/02/25 14:57:45 tsutsui Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include mips/asm.h #include mips/cpuregs.h -RCSID($NetBSD: spl.S,v 1.2 2011/02/20 07:45:48 matt Exp $) +RCSID($NetBSD: spl.S,v 1.3 2011/02/25 14:57:45 tsutsui Exp $) #include assym.h @@ -179,8 +179,8 @@ INT_L v1, _C_LABEL(ipl_sr_map) + 4*IPL_NONE PTR_L a3, L_CPU(MIPS_CURLWP) xor v1, MIPS_INT_MASK | MIPS_SR_INT_IE # invert and or in IE - #mtc0 zero, MIPS_COP_0_CAUSE # clear SOFT_INT bits - #COP0_SYNC + mtc0 zero, MIPS_COP_0_CAUSE # clear SOFT_INT bits + COP0_SYNC mfc0 a0, MIPS_COP_0_STATUS NOP_L # load delay or v0, a0, v1
CVS commit: src/lib/librumpclient
Module Name:src Committed By: pooka Date: Fri Feb 25 15:12:06 UTC 2011 Modified Files: src/lib/librumpclient: rumpclient.c Log Message: fix __RCSID To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/lib/librumpclient/rumpclient.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpclient/rumpclient.c diff -u src/lib/librumpclient/rumpclient.c:1.36 src/lib/librumpclient/rumpclient.c:1.37 --- src/lib/librumpclient/rumpclient.c:1.36 Thu Feb 24 14:22:04 2011 +++ src/lib/librumpclient/rumpclient.c Fri Feb 25 15:12:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpclient.c,v 1.36 2011/02/24 14:22:04 pooka Exp $ */ +/* $NetBSD: rumpclient.c,v 1.37 2011/02/25 15:12:06 pooka Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD); +__RCSID($NetBSD: rumpclient.c,v 1.37 2011/02/25 15:12:06 pooka Exp $); #include sys/param.h #include sys/event.h
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 16:54:36 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Also declare support for APERF/MPERF during the BIOS _PDC/_OSC query.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/acpi/acpi_cpu_md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.43 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.44
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.43 Fri Feb 25 12:08:35 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Feb 25 16:54:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.43 2011/02/25 12:08:35 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.44 2011/02/25 16:54:36 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.43 2011/02/25 12:08:35 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.44 2011/02/25 16:54:36 jruoho Exp $);
#include sys/param.h
#include sys/bus.h
@@ -122,6 +122,7 @@
acpicpu_md_cap(void)
{
struct cpu_info *ci = curcpu();
+ uint32_t regs[4];
uint32_t val = 0;
if (cpu_vendor != CPUVENDOR_IDT
@@ -149,6 +150,17 @@
if ((ci-ci_feat_val[0] CPUID_ACPI) != 0)
val |= ACPICPU_PDC_T_FFH;
+ /*
+ * Declare support for APERF and MPERF.
+ */
+ if (cpuid_level = 0x06) {
+
+ x86_cpuid(0x0006, regs);
+
+ if ((regs[2] CPUID_DSPM_HWF) != 0)
+ val |= ACPICPU_PDC_P_HW;
+ }
+
return val;
}
@@ -212,7 +224,7 @@
*/
if (cpuid_level = 0x06) {
- x86_cpuid(0x06, regs);
+ x86_cpuid(0x0006, regs);
if ((regs[2] CPUID_DSPM_HWF) != 0)
val |= ACPICPU_FLAG_P_HW;
@@ -300,7 +312,7 @@
x86_cpuid(0x0006, regs);
-if ((regs[2] __BIT(0)) != 0)
+if ((regs[2] CPUID_DSPM_HWF) != 0)
val |= ACPICPU_FLAG_P_HW;
}
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 17:23:35 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Fix an oversigh; the APERF and MPERF counters are per-CPU, so also reset
these by broadcasting to all CPUs with x86_msr_xcall(9).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/acpi/acpi_cpu_md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.45 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.46
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.45 Fri Feb 25 17:07:30 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Feb 25 17:23:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.45 2011/02/25 17:07:30 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.46 2011/02/25 17:23:34 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.45 2011/02/25 17:07:30 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.46 2011/02/25 17:23:34 jruoho Exp $);
#include sys/param.h
#include sys/bus.h
@@ -666,12 +666,25 @@
static void
acpicpu_md_pstate_percent_reset(struct acpicpu_softc *sc)
{
+ struct msr_rw_info msr;
+ uint64_t xc;
KASSERT((sc-sc_flags ACPICPU_FLAG_P) != 0);
KASSERT((sc-sc_flags ACPICPU_FLAG_P_HW) != 0);
- wrmsr(MSR_APERF, 0);
- wrmsr(MSR_MPERF, 0);
+ msr.msr_value = 0;
+ msr.msr_read = false;
+ msr.msr_type = MSR_APERF;
+
+ xc = xc_broadcast(0, (xcfunc_t)x86_msr_xcall, msr, NULL);
+ xc_wait(xc);
+
+ msr.msr_value = 0;
+ msr.msr_read = false;
+ msr.msr_type = MSR_MPERF;
+
+ xc = xc_broadcast(0, (xcfunc_t)x86_msr_xcall, msr, NULL);
+ xc_wait(xc);
sc-sc_pstate_aperf = 0;
sc-sc_pstate_mperf = 0;
CVS commit: src/tests/lib/libc/ssp
Module Name:src
Committed By: pgoyette
Date: Fri Feb 25 18:11:53 UTC 2011
Modified Files:
src/tests/lib/libc/ssp: t_ssp.sh
Log Message:
Disable the raw test case. The test is bogus, and did not work before
conversion from src/regress/ to atf
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/ssp/t_ssp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/ssp/t_ssp.sh
diff -u src/tests/lib/libc/ssp/t_ssp.sh:1.2 src/tests/lib/libc/ssp/t_ssp.sh:1.3
--- src/tests/lib/libc/ssp/t_ssp.sh:1.2 Mon Dec 27 05:27:34 2010
+++ src/tests/lib/libc/ssp/t_ssp.sh Fri Feb 25 18:11:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_ssp.sh,v 1.2 2010/12/27 05:27:34 pgoyette Exp $
+# $NetBSD: t_ssp.sh,v 1.3 2011/02/25 18:11:53 pgoyette Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -46,8 +46,9 @@
{
prog=$(atf_get_srcdir)/h_raw
- h_pass $prog 9
- h_fail $prog 10
+ atk_skip Bogus test case
+# h_pass $prog 9
+# h_fail $prog 10
}
atf_test_case sprintf
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Fri Feb 25 18:29:01 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
support mknod. from riz
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.67 src/lib/librumphijack/hijack.c:1.68
--- src/lib/librumphijack/hijack.c:1.67 Thu Feb 24 12:25:44 2011
+++ src/lib/librumphijack/hijack.c Fri Feb 25 18:29:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.67 2011/02/24 12:25:44 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.68 2011/02/25 18:29:00 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.67 2011/02/24 12:25:44 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.68 2011/02/25 18:29:00 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -93,6 +93,7 @@
DUALCALL___GETCWD,
DUALCALL_CHFLAGS, DUALCALL_LCHFLAGS, DUALCALL_FCHFLAGS,
DUALCALL_ACCESS,
+ DUALCALL_MKNOD,
DUALCALL__NUM
};
@@ -113,6 +114,7 @@
#define REALUTIMES utimes
#define REALLUTIMES lutimes
#define REALFUTIMES futimes
+#define REALMKNOD mknod
#else
#define REALSELECT _sys___select50
#define REALPOLLTS _sys___pollts50
@@ -122,7 +124,7 @@
#define REALFSTAT __fstat50
#define REALUTIMES __utimes50
#define REALLUTIMES __lutimes50
-#define REALFUTIMES __futimes50
+#define REALMKNOD __mknod50
#endif
#define REALREAD _sys_read
#define REALPREAD _sys_pread
@@ -147,6 +149,7 @@
int REALFUTIMES(int, const struct timeval [2]);
int REALMOUNT(const char *, const char *, int, void *, size_t);
int __getcwd(char *, size_t);
+int REALMKNOD(const char *, mode_t, dev_t);
#define S(a) __STRING(a)
struct sysnames {
@@ -218,6 +221,7 @@
{ DUALCALL_LCHFLAGS, lchflags, RSYS_NAME(LCHFLAGS) },
{ DUALCALL_FCHFLAGS, fchflags, RSYS_NAME(FCHFLAGS) },
{ DUALCALL_ACCESS, access, RSYS_NAME(ACCESS) },
+ { DUALCALL_MKNOD, S(REALMKNOD), RSYS_NAME(MKNOD) },
};
#undef S
@@ -1808,6 +1812,11 @@
(const char *, int), \
(path, mode))
+PATHCALL(int, REALMKNOD, DUALCALL_MKNOD,\
+ (const char *path, mode_t mode, dev_t dev), \
+ (const char *, mode_t, dev_t), \
+ (path, mode, dev))
+
/*
* Note: with mount the decisive parameter is the mount
* destination directory. This is because we don't really know
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Fri Feb 25 18:36:37 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: whoops, didn't mean to delete futimes in previous. also from riz To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumphijack/hijack.c diff -u src/lib/librumphijack/hijack.c:1.68 src/lib/librumphijack/hijack.c:1.69 --- src/lib/librumphijack/hijack.c:1.68 Fri Feb 25 18:29:00 2011 +++ src/lib/librumphijack/hijack.c Fri Feb 25 18:36:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hijack.c,v 1.68 2011/02/25 18:29:00 pooka Exp $ */ +/* $NetBSD: hijack.c,v 1.69 2011/02/25 18:36:36 pooka Exp $ */ /*- * Copyright (c) 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: hijack.c,v 1.68 2011/02/25 18:29:00 pooka Exp $); +__RCSID($NetBSD: hijack.c,v 1.69 2011/02/25 18:36:36 pooka Exp $); #define __ssp_weak_name(fun) _hijack_ ## fun @@ -124,6 +124,7 @@ #define REALFSTAT __fstat50 #define REALUTIMES __utimes50 #define REALLUTIMES __lutimes50 +#define REALFUTIMES __futimes50 #define REALMKNOD __mknod50 #endif #define REALREAD _sys_read
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Fri Feb 25 18:48:26 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Fix powernow section in xref. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/acpicpu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.24 src/share/man/man4/acpicpu.4:1.25 --- src/share/man/man4/acpicpu.4:1.24 Fri Feb 25 12:41:51 2011 +++ src/share/man/man4/acpicpu.4 Fri Feb 25 18:48:26 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.24 2011/02/25 12:41:51 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.25 2011/02/25 18:48:26 njoly Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -316,7 +316,7 @@ The P-state support provided by .Xr est 4 and -.Xr powernow 8 +.Xr powernow 4 are known to be either problematic or entirely dysfunctional with new x86 processors. .Sh SEE ALSO
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Feb 25 18:56:21 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: devsw.c
Log Message:
Don't autogenerate a large number of unnecessary device nodes, just
slows bootstrap.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.6 src/sys/rump/librump/rumpkern/devsw.c:1.7
--- src/sys/rump/librump/rumpkern/devsw.c:1.6 Thu Feb 10 11:01:31 2011
+++ src/sys/rump/librump/rumpkern/devsw.c Fri Feb 25 18:56:20 2011
@@ -45,7 +45,7 @@
{ ctty, -1, 1, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ null, -1, 2, DEVNODE_SINGLE, DEVNODE_FLAG_ISMINOR0, { DEV_NULL,0 }},
{ zero, -1, 2, DEVNODE_SINGLE, DEVNODE_FLAG_ISMINOR0, { DEV_ZERO,0 }},
- { wd, 0, 3, DEVNODE_VECTOR, 0, { 8, 8 }},
+ { wd, 0, 3, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ swap, 1, 4, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ pts, -1, 5, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ ptc, -1, 6, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
@@ -65,13 +65,13 @@
{ apm, -1, 21, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ filedesc, -1, 22, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ bpf, -1, 23, DEVNODE_VECTOR, DEVNODE_FLAG_LINKZERO, { 8, 0 }},
- { md, 17, 24, DEVNODE_VECTOR, 0, { 4, 8 }},
+ { md, 17, 24, DEVNODE_VECTOR, 0, { 2, 8 }},
{ joy, -1, 26, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ spkr, -1, 27, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ cy, -1, 38, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ mcd, 7, 39, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ tun, -1, 40, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { vnd, 14, 41, DEVNODE_VECTOR, 0, { 8, 8 }},
+ { vnd, 14, 41, DEVNODE_VECTOR, 0, { 2, 8 }},
{ audio, -1, 42, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ svr4_net, -1, 43, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ ipl, -1, 44, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
CVS commit: src/sys/rump/dev/lib/libaudio
Module Name:src Committed By: riz Date: Fri Feb 25 19:27:05 UTC 2011 Modified Files: src/sys/rump/dev/lib/libaudio: component.c Log Message: Use AUDIO_DEVICE instead of 0 as the minor number for /dev/audio since 0 is incorrect. While I'm here, add /dev/sound, audioctl, and mixer too. ok pooka@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libaudio/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/dev/lib/libaudio/component.c diff -u src/sys/rump/dev/lib/libaudio/component.c:1.1 src/sys/rump/dev/lib/libaudio/component.c:1.2 --- src/sys/rump/dev/lib/libaudio/component.c:1.1 Sat May 1 23:19:56 2010 +++ src/sys/rump/dev/lib/libaudio/component.c Fri Feb 25 19:27:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: component.c,v 1.1 2010/05/01 23:19:56 pooka Exp $ */ +/* $NetBSD: component.c,v 1.2 2011/02/25 19:27:05 riz Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2010/05/01 23:19:56 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2011/02/25 19:27:05 riz Exp $); #include sys/param.h #include sys/conf.h @@ -34,6 +34,8 @@ #include sys/mbuf.h #include sys/stat.h +#include dev/audio_if.h + #include ioconf.c #include rump_private.h @@ -53,6 +55,15 @@ audio_cdevsw, cmaj)) != 0) panic(audio devsw attach failed: %d, error); if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/audio, '0', - cmaj, 0, 4)) !=0) + cmaj, AUDIO_DEVICE, 4)) !=0) panic(cannot create audio device nodes: %d, error); + if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/sound, '0', + cmaj, SOUND_DEVICE, 4)) !=0) + panic(cannot create sound device nodes: %d, error); + if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/audioctl, '0', + cmaj, AUDIOCTL_DEVICE, 4)) !=0) + panic(cannot create audioctl device nodes: %d, error); + if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/mixer, '0', + cmaj, MIXER_DEVICE, 4)) !=0) + panic(cannot create mixer device nodes: %d, error); }
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: tsutsui
Date: Fri Feb 25 19:32:51 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
Fix LOCKDEBUG spin lock held panic on MIPS_CACHE_VIRTUAL_ALIAS CPUs.
Now cobalt boots multiuser, but many programs complains
clntudp_create: RPC: Program not registered
as well as R5000 sgimips O2. Smells virtual cache alias issue around pool...
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.195 src/sys/arch/mips/mips/pmap.c:1.196
--- src/sys/arch/mips/mips/pmap.c:1.195 Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/pmap.c Fri Feb 25 19:32:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.195 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.196 2011/02/25 19:32:51 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.195 2011/02/20 07:45:48 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.196 2011/02/25 19:32:51 tsutsui Exp $);
/*
* Manages physical address maps.
@@ -2234,7 +2234,7 @@
pmap, va);
#endif
if (__predict_true(apv == NULL)) {
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG)
/*
* To allocate a PV, we have to release the PVLIST lock
* so get the page generation. We allocate the PV, and
@@ -2245,6 +2245,7 @@
apv = (pv_entry_t)pmap_pv_alloc();
if (apv == NULL)
panic(pmap_enter_pv: pmap_pv_alloc() failed);
+#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG)
#ifdef MULTIPROCESSOR
/*
* If the generation has changed, then someone else
@@ -2252,10 +2253,13 @@
* start over.
*/
uint16_t oldgen = gen;
+#endif
gen = PG_MD_PVLIST_LOCK(md, true);
+#ifdef MULTIPROCESSOR
if (gen != oldgen)
goto again;
#endif
+#endif
}
npv = apv;
apv = NULL;
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Fri Feb 25 19:55:07 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c
acpi_cpu_pstate.c acpi_cpu_tstate.c
Log Message:
Start to derive the percpu(9) (or per-domain) state coordination
mechanisms by parsing the _CSD, _PSD, and _TSD objects by default.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/acpi/acpi_cpu_cstate.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/acpi/acpi_cpu_pstate.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/acpi/acpi_cpu_tstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.28 src/sys/dev/acpi/acpi_cpu.c:1.29
--- src/sys/dev/acpi/acpi_cpu.c:1.28 Fri Feb 25 12:08:35 2011
+++ src/sys/dev/acpi/acpi_cpu.c Fri Feb 25 19:55:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.28 2011/02/25 12:08:35 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.29 2011/02/25 19:55:06 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.28 2011/02/25 12:08:35 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.29 2011/02/25 19:55:06 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -54,6 +54,8 @@
static int acpicpu_once_detach(void);
static void acpicpu_prestart(device_t);
static void acpicpu_start(device_t);
+static void acpicpu_debug_print(struct acpicpu_softc *);
+static const char *acpicpu_debug_print_dep(uint32_t);
static void acpicpu_sysctl(device_t);
static int acpicpu_object(ACPI_HANDLE, struct acpicpu_object *);
@@ -145,6 +147,7 @@
acpicpu_sc[id] = sc;
sc-sc_cap = acpicpu_cap(sc);
+ sc-sc_ncpus = acpi_md_ncpus();
sc-sc_flags |= acpicpu_md_flags();
mutex_init(sc-sc_mtx, MUTEX_DEFAULT, IPL_NONE);
@@ -156,6 +159,8 @@
(void)config_defer(self, acpicpu_prestart);
(void)acpi_register_notify(sc-sc_node, acpicpu_notify);
(void)pmf_device_register(self, acpicpu_suspend, acpicpu_resume);
+
+ acpicpu_debug_print(sc);
}
static int
@@ -632,6 +637,59 @@
return true;
}
+static void
+acpicpu_debug_print(struct acpicpu_softc *sc)
+{
+ struct acpicpu_dep *dep;
+
+ if ((sc-sc_flags ACPICPU_FLAG_C_DEP) != 0) {
+
+ dep = sc-sc_cstate_dep;
+
+ aprint_debug_dev(sc-sc_dev, C-state coordination:
+ %u CPUs, domain %u, type %s\n, dep-dep_ncpus,
+ dep-dep_domain, acpicpu_debug_print_dep(dep-dep_type));
+ }
+
+ if ((sc-sc_flags ACPICPU_FLAG_P_DEP) != 0) {
+
+ dep = sc-sc_pstate_dep;
+
+ aprint_debug_dev(sc-sc_dev, P-state coordination:
+ %u CPUs, domain %u, type %s\n, dep-dep_ncpus,
+ dep-dep_domain, acpicpu_debug_print_dep(dep-dep_type));
+ }
+
+ if ((sc-sc_flags ACPICPU_FLAG_T_DEP) != 0) {
+
+ dep = sc-sc_tstate_dep;
+
+ aprint_debug_dev(sc-sc_dev, T-state coordination:
+ %u CPUs, domain %u, type %s\n, dep-dep_ncpus,
+ dep-dep_domain, acpicpu_debug_print_dep(dep-dep_type));
+ }
+}
+
+static const char *
+acpicpu_debug_print_dep(uint32_t val)
+{
+
+ switch (val) {
+
+ case ACPICPU_DEP_SW_ALL:
+ return SW_ALL;
+
+ case ACPICPU_DEP_SW_ANY:
+ return SW_ANY;
+
+ case ACPICPU_DEP_HW_ALL:
+ return HW_ALL;
+
+ default:
+ return unknown;
+ }
+}
+
MODULE(MODULE_CLASS_DRIVER, acpicpu, NULL);
#ifdef _MODULE
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.31 src/sys/dev/acpi/acpi_cpu.h:1.32
--- src/sys/dev/acpi/acpi_cpu.h:1.31 Fri Feb 25 12:08:35 2011
+++ src/sys/dev/acpi/acpi_cpu.h Fri Feb 25 19:55:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.31 2011/02/25 12:08:35 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.32 2011/02/25 19:55:06 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -63,6 +63,13 @@
#define ACPICPU_T_NOTIFY 0x82 /* _TPC */
/*
+ * Dependency coordination.
+ */
+#define ACPICPU_DEP_SW_ALL 0xFC
+#define ACPICPU_DEP_SW_ANY 0xFD
+#define ACPICPU_DEP_HW_ALL 0xFE
+
+/*
* C-states.
*/
#define ACPICPU_C_C2_LATENCY_MAX 100 /* us */
@@ -97,21 +104,24 @@
#define ACPICPU_FLAG_C_FFH __BIT(4) /* Native C-states */
#define ACPICPU_FLAG_C_FADT __BIT(5) /* C-states with FADT*/
-#define ACPICPU_FLAG_C_BM __BIT(6) /* Bus master control*/
-#define ACPICPU_FLAG_C_BM_STS __BIT(7) /* Bus master check required */
-#define ACPICPU_FLAG_C_ARB __BIT(8) /* Bus master arbitration*/
-#define ACPICPU_FLAG_C_TSC __BIT(9) /* TSC broken, C1, Px, Tx */
-#define ACPICPU_FLAG_C_APIC __BIT(10) /* APIC timer broken, C1 */
-#define ACPICPU_FLAG_C_C1E __BIT(11) /* AMD C1E detected */
-
-#define ACPICPU_FLAG_P_FFH __BIT(12) /* Native P-states */
-#define ACPICPU_FLAG_P_HW
CVS commit: src
Module Name:src
Committed By: drochner
Date: Fri Feb 25 20:13:10 UTC 2011
Modified Files:
src/share/man/man4: crypto.4
src/sys/netipsec: xform.h xform_esp.c
src/sys/opencrypto: cryptodev.h cryptosoft.c xform.c xform.h
Log Message:
make the use of SHA2-HMAC by FAST_IPSEC compliant to current standards:
-RFC2104 says that the block size of the hash algorithm must be used
for key/ipad/opad calculations. While formerly all ciphers used a block
length of 64, SHA384 and SHA512 use 128 bytes. So we can't use the
HMAC_BLOCK_LEN constant anymore. Add a new field to struct auth_hash
for the per-cipher blocksize.
-Due to this, there can't be a single CRYPTO_SHA2_HMAC external name
anymore. Replace this by 3 for the 3 different keysizes.
This was done by Open/FreeBSD before.
-Also fix the number of authenticator bits used tor ESP and AH to
conform to RFC4868, and remove uses of AH_HMAC_HASHLEN which did
assume a fixed authenticator size of 12 bytes.
FAST_IPSEC will not interoperate with KAME IPSEC anymore if sha2 is used,
because the latter doesn't implement these standards. It should
interoperate with at least modern Free/OpenBSD now.
(I've only tested with NetBSD-current/FAST_IPSEC on both ends.)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/crypto.4
cvs rdiff -u -r1.6 -r1.7 src/sys/netipsec/xform.h
cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/opencrypto/cryptodev.h
cvs rdiff -u -r1.28 -r1.29 src/sys/opencrypto/cryptosoft.c
cvs rdiff -u -r1.19 -r1.20 src/sys/opencrypto/xform.c
cvs rdiff -u -r1.11 -r1.12 src/sys/opencrypto/xform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/crypto.4
diff -u src/share/man/man4/crypto.4:1.21 src/share/man/man4/crypto.4:1.22
--- src/share/man/man4/crypto.4:1.21 Tue Apr 20 08:37:22 2010
+++ src/share/man/man4/crypto.4 Fri Feb 25 20:13:10 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: crypto.4,v 1.21 2010/04/20 08:37:22 jruoho Exp $
+.\ $NetBSD: crypto.4,v 1.22 2011/02/25 20:13:10 drochner Exp $
.\
.\ Copyright (c) 2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -207,7 +207,9 @@
.It CRYPTO_SHA1_KPDK
.It CRYPTO_MD5_HMAC
.It CRYPTO_SHA1_HMAC
-.It CRYPTO_SHA2_HMAC
+.It CRYPTO_SHA2_256_HMAC
+.It CRYPTO_SHA2_384_HMAC
+.It CRYPTO_SHA2_512_HMAC
.It CRYPTO_MD5
.It CRYPTO_SHA1
.El
Index: src/sys/netipsec/xform.h
diff -u src/sys/netipsec/xform.h:1.6 src/sys/netipsec/xform.h:1.7
--- src/sys/netipsec/xform.h:1.6 Fri Feb 18 20:40:58 2011
+++ src/sys/netipsec/xform.h Fri Feb 25 20:13:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform.h,v 1.6 2011/02/18 20:40:58 drochner Exp $ */
+/* $NetBSD: xform.h,v 1.7 2011/02/25 20:13:10 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $ */
/*
@@ -46,7 +46,6 @@
#include netinet/in.h
#include opencrypto/xform.h
-#define AH_HMAC_HASHLEN 12 /* 96 bits of authenticator */
#define AH_HMAC_INITIAL_RPL 1 /* replay counter initial value */
/*
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.29 src/sys/netipsec/xform_esp.c:1.30
--- src/sys/netipsec/xform_esp.c:1.29 Sat Feb 19 18:26:50 2011
+++ src/sys/netipsec/xform_esp.c Fri Feb 25 20:13:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.29 2011/02/19 18:26:50 degroote Exp $ */
+/* $NetBSD: xform_esp.c,v 1.30 2011/02/25 20:13:10 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.29 2011/02/19 18:26:50 degroote Exp $);
+__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.30 2011/02/25 20:13:10 drochner Exp $);
#include opt_inet.h
#ifdef __FreeBSD__
@@ -310,7 +310,7 @@
else
hlen = sizeof (struct newesp) + sav-ivlen;
/* Authenticator hash size */
- alen = esph ? AH_HMAC_HASHLEN : 0;
+ alen = esph ? esph-authsize : 0;
/*
* Verify payload length is multiple of encryption algorithm
@@ -463,7 +463,7 @@
static int
esp_input_cb(struct cryptop *crp)
{
- u_int8_t lastthree[3], aalg[AH_HMAC_HASHLEN];
+ u_int8_t lastthree[3], aalg[AH_ALEN_MAX];
int s, hlen, skip, protoff, error;
struct mbuf *m;
struct cryptodesc *crd;
@@ -735,7 +735,7 @@
plen = rlen + padding; /* Padded payload length. */
if (esph)
- alen = AH_HMAC_HASHLEN;
+ alen = esph-authsize;
else
alen = 0;
@@ -992,7 +992,7 @@
#ifdef IPSEC_DEBUG
/* Emulate man-in-the-middle attack when ipsec_integrity is TRUE. */
if (ipsec_integrity) {
- static unsigned char ipseczeroes[AH_HMAC_HASHLEN];
+ static unsigned char ipseczeroes[AH_ALEN_MAX];
const struct auth_hash *esph;
/*
@@ -1001,8 +1001,8 @@
*/
esph = sav-tdb_authalgxform;
CVS commit: src/tests/fs/hfs
Module Name:src Committed By: martin Date: Fri Feb 25 20:54:18 UTC 2011 Modified Files: src/tests/fs/hfs: t_pathconvert.c Log Message: Remove xfail for sparc64, alignement issues have been fixed To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/fs/hfs/t_pathconvert.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/hfs/t_pathconvert.c diff -u src/tests/fs/hfs/t_pathconvert.c:1.4 src/tests/fs/hfs/t_pathconvert.c:1.5 --- src/tests/fs/hfs/t_pathconvert.c:1.4 Thu Feb 24 17:29:48 2011 +++ src/tests/fs/hfs/t_pathconvert.c Fri Feb 25 20:54:18 2011 @@ -1,10 +1,9 @@ -/* $NetBSD: t_pathconvert.c,v 1.4 2011/02/24 17:29:48 pooka Exp $ */ +/* $NetBSD: t_pathconvert.c,v 1.5 2011/02/25 20:54:18 martin Exp $ */ #include sys/types.h #include sys/mount.h #include atf-c.h -#include atf-c/config.h #include dirent.h #include errno.h #include fcntl.h @@ -54,9 +53,6 @@ RL(rump_sys_mkdir(/mp, 0777)); RZ(rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK)); - - if (strcmp(atf_config_get(atf_arch), sparc64) == 0) - atf_tc_expect_signal(-1, PR kern/44631); RL(rump_sys_mount(MOUNT_HFS, /mp, 0, args, sizeof args)); RL(dirfd = rump_sys_open(/mp, O_RDONLY));
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 20:59:38 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu.h Log Message: Comment the coordination types. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/acpi_cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_cpu.h diff -u src/sys/dev/acpi/acpi_cpu.h:1.32 src/sys/dev/acpi/acpi_cpu.h:1.33 --- src/sys/dev/acpi/acpi_cpu.h:1.32 Fri Feb 25 19:55:06 2011 +++ src/sys/dev/acpi/acpi_cpu.h Fri Feb 25 20:59:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu.h,v 1.32 2011/02/25 19:55:06 jruoho Exp $ */ +/* $NetBSD: acpi_cpu.h,v 1.33 2011/02/25 20:59:37 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -65,9 +65,9 @@ /* * Dependency coordination. */ -#define ACPICPU_DEP_SW_ALL 0xFC -#define ACPICPU_DEP_SW_ANY 0xFD -#define ACPICPU_DEP_HW_ALL 0xFE +#define ACPICPU_DEP_SW_ALL 0xFC /* All CPUs must set a state */ +#define ACPICPU_DEP_SW_ANY 0xFD /* Any CPU can set a state */ +#define ACPICPU_DEP_HW_ALL 0xFE /* HW does the coordination */ /* * C-states.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Feb 25 21:10:33 UTC 2011 Modified Files: src/share/man/man4: crypto.4 Log Message: Bump date for new crypto types. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/crypto.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/crypto.4 diff -u src/share/man/man4/crypto.4:1.22 src/share/man/man4/crypto.4:1.23 --- src/share/man/man4/crypto.4:1.22 Fri Feb 25 20:13:10 2011 +++ src/share/man/man4/crypto.4 Fri Feb 25 21:10:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: crypto.4,v 1.22 2011/02/25 20:13:10 drochner Exp $ +.\ $NetBSD: crypto.4,v 1.23 2011/02/25 21:10:33 wiz Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -53,7 +53,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\ THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 20, 2010 +.Dd February 25, 2011 .Dt CRYPTO 4 .Os .Sh NAME
CVS commit: src/usr.sbin/pcictl
Module Name:src
Committed By: jmcneill
Date: Fri Feb 25 21:40:48 UTC 2011
Modified Files:
src/usr.sbin/pcictl: pcictl.8 pcictl.c
Log Message:
make pcictl pci0 list dump all busses by default, unless a bus number is
specified with -b
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/pcictl/pcictl.8
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/pcictl/pcictl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/pcictl/pcictl.8
diff -u src/usr.sbin/pcictl/pcictl.8:1.9 src/usr.sbin/pcictl/pcictl.8:1.10
--- src/usr.sbin/pcictl/pcictl.8:1.9 Fri Feb 25 14:11:25 2011
+++ src/usr.sbin/pcictl/pcictl.8 Fri Feb 25 21:40:48 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: pcictl.8,v 1.9 2011/02/25 14:11:25 wiz Exp $
+.\ $NetBSD: pcictl.8,v 1.10 2011/02/25 21:40:48 jmcneill Exp $
.\
.\ Copyright 2001 Wasabi Systems, Inc.
.\ All rights reserved.
@@ -65,10 +65,7 @@
is given, as numbers.
The bus, device, and function
numbers may be specified by flags.
-If the bus is not specified, it defaults to the bus number of the
-PCI bus specified on the command line.
-If the bus is \-1, devices on all busses are listed.
-Any other locator not specified defaults
+Any locator not specified defaults
to a wildcard, or may be explicitly wildcarded by specifying
.Dq any .
.Pp
Index: src/usr.sbin/pcictl/pcictl.c
diff -u src/usr.sbin/pcictl/pcictl.c:1.16 src/usr.sbin/pcictl/pcictl.c:1.17
--- src/usr.sbin/pcictl/pcictl.c:1.16 Sat Jul 4 20:34:23 2009
+++ src/usr.sbin/pcictl/pcictl.c Fri Feb 25 21:40:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcictl.c,v 1.16 2009/07/04 20:34:23 cegger Exp $ */
+/* $NetBSD: pcictl.c,v 1.17 2011/02/25 21:40:48 jmcneill Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -159,7 +159,7 @@
int bus, dev, func;
int ch;
- bus = pci_businfo.busno;
+ bus = -1;
dev = func = -1;
while ((ch = getopt(argc, argv, nb:d:f:)) != -1) {
CVS commit: src/sys/dev/tprof
Module Name:src
Committed By: yamt
Date: Fri Feb 25 22:35:38 UTC 2011
Modified Files:
src/sys/dev/tprof: tprof.c
Log Message:
tprof_start: don't forget to restore refcount when failed to start backend.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/tprof/tprof.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/tprof/tprof.c
diff -u src/sys/dev/tprof/tprof.c:1.8 src/sys/dev/tprof/tprof.c:1.9
--- src/sys/dev/tprof/tprof.c:1.8 Sat Feb 5 14:04:40 2011
+++ src/sys/dev/tprof/tprof.c Fri Feb 25 22:35:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.8 2011/02/05 14:04:40 yamt Exp $ */
+/* $NetBSD: tprof.c,v 1.9 2011/02/25 22:35:38 yamt Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tprof.c,v 1.8 2011/02/05 14:04:40 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tprof.c,v 1.9 2011/02/25 22:35:38 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -295,6 +295,8 @@
error = tb-tb_ops-tbo_start(NULL);
if (error != 0) {
+ KASSERT(tb-tb_usecount 0);
+ tb-tb_usecount--;
tprof_stop1();
goto done;
}
CVS commit: src/gnu/dist/gcc4/gcc/config/rs6000
Module Name:src Committed By: matt Date: Fri Feb 25 22:36:10 UTC 2011 Modified Files: src/gnu/dist/gcc4/gcc/config/rs6000: netbsd.h Log Message: Explicitly make sure TARGET_SECURE_PLT is defined correctly rather than relying on HAVE_AS_REL16 from auto-host.h. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h diff -u src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.5 src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.6 --- src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h:1.5 Thu Feb 10 07:18:29 2011 +++ src/gnu/dist/gcc4/gcc/config/rs6000/netbsd.h Fri Feb 25 22:36:10 2011 @@ -124,6 +124,13 @@ #undef TARGET_DEFAULT #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_STRICT_ALIGN) +/* + * We know we have the right binutils for this (we shouldn't need to do this + * but until the cross build does the right thing...) + */ +#undef TARGET_SECURE_PLT +#define TARGET_SECURE_PLT secure_plt + #undef TARGET_E500 #undef TARGET_E500_SINGLE #undef TARGET_E500_DOUBLE
CVS commit: src/sys/sys
Module Name:src Committed By: yamt Date: Fri Feb 25 22:37:12 UTC 2011 Modified Files: src/sys/sys: userret.h Log Message: mi_userret: disable an assertion for __HAVE_PREEMPTION case as it's racy. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/sys/userret.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/userret.h diff -u src/sys/sys/userret.h:1.21 src/sys/sys/userret.h:1.22 --- src/sys/sys/userret.h:1.21 Thu Feb 17 19:29:41 2011 +++ src/sys/sys/userret.h Fri Feb 25 22:37:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.21 2011/02/17 19:29:41 matt Exp $ */ +/* $NetBSD: userret.h,v 1.22 2011/02/25 22:37:12 yamt Exp $ */ /*- * Copyright (c) 1998, 2000, 2003, 2006, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,9 @@ #endif KASSERT(l-l_blcnt == 0); +#ifndef __HAVE_PREEMPTION KASSERT(curcpu()-ci_biglock_count == 0); +#endif /* * Handle exceptional events: pending signals, stop/exit actions,
CVS commit: src/tools
Module Name:src
Committed By: phx
Date: Fri Feb 25 23:29:16 UTC 2011
Modified Files:
src/tools: Makefile
Log Message:
mkubootimage is certainly useful for sandpoint
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.142 src/tools/Makefile:1.143
--- src/tools/Makefile:1.142 Sun Feb 6 01:14:11 2011
+++ src/tools/Makefile Fri Feb 25 23:29:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2011/02/06 01:14:11 joerg Exp $
+# $NetBSD: Makefile,v 1.143 2011/02/25 23:29:16 phx Exp $
.include bsd.own.mk
@@ -129,7 +129,8 @@
SUBDIR+= hp300-mkboot
.endif
-.if ${MACHINE} == evbarm || ${MACHINE} == evbmips || ${MACHINE} == evbppc
+.if ${MACHINE} == evbarm || ${MACHINE} == evbmips || \
+${MACHINE} == evbppc || ${MACHINE} == sandpoint
SUBDIR+= mkubootimage
.endif
CVS commit: src/sys/arch/sgimips/stand/boot64
Module Name:src
Committed By: matt
Date: Fri Feb 25 23:37:33 UTC 2011
Modified Files:
src/sys/arch/sgimips/stand/boot64: Makefile
Log Message:
Don't rely on having a mips64eb toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/stand/boot64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/stand/boot64/Makefile
diff -u src/sys/arch/sgimips/stand/boot64/Makefile:1.10 src/sys/arch/sgimips/stand/boot64/Makefile:1.11
--- src/sys/arch/sgimips/stand/boot64/Makefile:1.10 Sun Feb 20 07:59:52 2011
+++ src/sys/arch/sgimips/stand/boot64/Makefile Fri Feb 25 23:37:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/02/20 07:59:52 matt Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/25 23:37:32 matt Exp $
PROG= ip30boot
NOMAN= # defined
@@ -31,7 +31,8 @@
CPPFLAGS+= -Dsgimips
-MACHINE_ARCH= mips64eb
+LDFLAGS+= -m elf64btsmip
+LINKFORMAT+=-m elf64btsmip
.include ${S}/dev/arcbios/Makefile.inc
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Sat Feb 26 01:17:24 UTC 2011
Modified Files:
src/usr.bin/make: make.1
Log Message:
Fix rendering of :? example
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.182 src/usr.bin/make/make.1:1.183
--- src/usr.bin/make/make.1:1.182 Tue Sep 14 11:57:03 2010
+++ src/usr.bin/make/make.1 Sat Feb 26 01:17:24 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: make.1,v 1.182 2010/09/14 11:57:03 wiz Exp $
+.\ $NetBSD: make.1,v 1.183 2011/02/26 01:17:24 sjg Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\
-.Dd September 13, 2010
+.Dd February 25, 2011
.Dt MAKE 1
.Os
.Sh NAME
@@ -1173,7 +1173,7 @@
.Dl ${NUMBERS:M42:?match:no}
which actually tests defined(NUMBERS),
to determine is any words match 42 you need to use something like:
-.Dl ${${NUMBERS:M42} != :?match:no} .
+.Dl ${${NUMBERS:M42} != \\:?match:no} .
.It Ar :old_string=new_string
This is the
.At V
CVS commit: src/tests/lib/libc/ssp
Module Name:src
Committed By: pgoyette
Date: Sat Feb 26 02:41:34 UTC 2011
Modified Files:
src/tests/lib/libc/ssp: Makefile t_ssp.sh
Removed Files:
src/tests/lib/libc/ssp: h_raw.c
Log Message:
The ssp/raw test is useless. Remove it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/ssp/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/ssp/h_raw.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/ssp/t_ssp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.1 src/tests/lib/libc/ssp/Makefile:1.2
--- src/tests/lib/libc/ssp/Makefile:1.1 Mon Dec 27 02:04:19 2010
+++ src/tests/lib/libc/ssp/Makefile Sat Feb 26 02:41:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/12/27 02:04:19 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/26 02:41:33 pgoyette Exp $
NOMAN= # defined
@@ -32,7 +32,6 @@
PROGS+= h_memcpy
PROGS+= h_memmove
PROGS+= h_memset
-PROGS+= h_raw
PROGS+= h_read
PROGS+= h_readlink
PROGS+= h_snprintf
Index: src/tests/lib/libc/ssp/t_ssp.sh
diff -u src/tests/lib/libc/ssp/t_ssp.sh:1.3 src/tests/lib/libc/ssp/t_ssp.sh:1.4
--- src/tests/lib/libc/ssp/t_ssp.sh:1.3 Fri Feb 25 18:11:53 2011
+++ src/tests/lib/libc/ssp/t_ssp.sh Sat Feb 26 02:41:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_ssp.sh,v 1.3 2011/02/25 18:11:53 pgoyette Exp $
+# $NetBSD: t_ssp.sh,v 1.4 2011/02/26 02:41:33 pgoyette Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,20 +37,6 @@
eval $2 atf_check -s signal:6 -o ignore -e ignore $1
}
-atf_test_case raw
-raw_head()
-{
- atf_set descr Checks basic stack protection
-}
-raw_body()
-{
- prog=$(atf_get_srcdir)/h_raw
-
- atk_skip Bogus test case
-# h_pass $prog 9
-# h_fail $prog 10
-}
-
atf_test_case sprintf
sprintf_head()
{
@@ -261,7 +247,6 @@
atf_init_test_cases()
{
- atf_add_test_case raw
atf_add_test_case sprintf
atf_add_test_case vsprintf
atf_add_test_case snprintf
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Sat Feb 26 02:41:57 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: ssp/raw test has been removed. To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.254 src/distrib/sets/lists/tests/mi:1.255 --- src/distrib/sets/lists/tests/mi:1.254 Thu Feb 24 10:30:03 2011 +++ src/distrib/sets/lists/tests/mi Sat Feb 26 02:41:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.254 2011/02/24 10:30:03 pooka Exp $ +# $NetBSD: mi,v 1.255 2011/02/26 02:41:56 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -372,7 +372,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memcpy.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memmove.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memset.debug tests-lib-debug debug,atf,ssp -./usr/libdata/debug/usr/tests/lib/libc/ssp/h_raw.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_read.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_readlink.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_snprintf.debug tests-lib-debug debug,atf,ssp @@ -1776,7 +1775,6 @@ ./usr/tests/lib/libc/ssp/h_memcpy tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_memmove tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_memset tests-lib-tests atf,ssp -./usr/tests/lib/libc/ssp/h_raw tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_read tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_readlink tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_snprintf tests-lib-tests atf,ssp
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: kiyohara Date: Sat Feb 26 05:23:22 UTC 2011 Modified Files: src/sys/arch/powerpc/powerpc: mach_machdep.c Log Message: s/tf_tf_/tf_/. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/powerpc/mach_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/powerpc/mach_machdep.c diff -u src/sys/arch/powerpc/powerpc/mach_machdep.c:1.29 src/sys/arch/powerpc/powerpc/mach_machdep.c:1.30 --- src/sys/arch/powerpc/powerpc/mach_machdep.c:1.29 Tue Jan 18 01:02:55 2011 +++ src/sys/arch/powerpc/powerpc/mach_machdep.c Sat Feb 26 05:23:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mach_machdep.c,v 1.29 2011/01/18 01:02:55 matt Exp $ */ +/* $NetBSD: mach_machdep.c,v 1.30 2011/02/26 05:23:22 kiyohara Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mach_machdep.c,v 1.29 2011/01/18 01:02:55 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mach_machdep.c,v 1.30 2011/02/26 05:23:22 kiyohara Exp $); #include opt_ppcarch.h #include sys/param.h @@ -125,8 +125,8 @@ tf-tf_lr = regs-lr; tf-tf_ctr = regs-ctr; #ifdef PPC_OEA - tf-tf_tf_mq = regs-mq; - tf-tf_tf_vrsave = regs-vrsave; + tf-tf_mq = regs-mq; + tf-tf_vrsave = regs-vrsave; #endif /* Wakeup the parent */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: kiyohara
Date: Sat Feb 26 05:25:27 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: darwin_machdep.c
Log Message:
Include uvm/uvm_extern.h.
s/tf-/tf-tf_/.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/darwin_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/darwin_machdep.c
diff -u src/sys/arch/powerpc/powerpc/darwin_machdep.c:1.28 src/sys/arch/powerpc/powerpc/darwin_machdep.c:1.29
--- src/sys/arch/powerpc/powerpc/darwin_machdep.c:1.28 Mon Apr 13 11:54:58 2009
+++ src/sys/arch/powerpc/powerpc/darwin_machdep.c Sat Feb 26 05:25:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_machdep.c,v 1.28 2009/04/13 11:54:58 he Exp $ */
+/* $NetBSD: darwin_machdep.c,v 1.29 2011/02/26 05:25:27 kiyohara Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: darwin_machdep.c,v 1.28 2009/04/13 11:54:58 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: darwin_machdep.c,v 1.29 2011/02/26 05:25:27 kiyohara Exp $);
#include sys/param.h
#include sys/systm.h
@@ -38,6 +38,8 @@
#include sys/mount.h
#include sys/signal.h
+#include uvm/uvm_extern.h
+
#include compat/sys/signal.h
#include compat/sys/signalvar.h
@@ -92,7 +94,7 @@
l-l_sigstk.ss_size);
stack_size = l-l_sigstk.ss_size;
} else {
- sfp = (struct darwin_sigframe *)tf-fixreg[1];
+ sfp = (struct darwin_sigframe *)tf-tf_fixreg[1];
stack_size = 0;
}
/* 16 bytes alignement */
@@ -100,17 +102,17 @@
/* Prepare the signal frame */
memset(sf, 0, sizeof(sf));
- sf.dmc.es.dar = tf-dar;
- sf.dmc.es.dsisr = tf-dsisr;
- sf.dmc.es.exception = tf-exc;
-
- sf.dmc.ss.srr0 = tf-srr0;
- sf.dmc.ss.srr1 = tf-srr1 PSL_USERSRR1;
- memcpy(sf.dmc.ss.gpreg[0], tf-fixreg[0], sizeof(sf.dmc.ss.gpreg));
- sf.dmc.ss.cr = tf-cr;
- sf.dmc.ss.xer = tf-xer;
- sf.dmc.ss.lr = tf-lr;
- sf.dmc.ss.ctr = tf-ctr;
+ sf.dmc.es.dar = tf-tf_dar;
+ sf.dmc.es.dsisr = tf-tf_dsisr;
+ sf.dmc.es.exception = tf-tf_exc;
+
+ sf.dmc.ss.srr0 = tf-tf_srr0;
+ sf.dmc.ss.srr1 = tf-tf_srr1 PSL_USERSRR1;
+ memcpy(sf.dmc.ss.gpreg[0], tf-tf_fixreg[0], sizeof(sf.dmc.ss.gpreg));
+ sf.dmc.ss.cr = tf-tf_cr;
+ sf.dmc.ss.xer = tf-tf_xer;
+ sf.dmc.ss.lr = tf-tf_lr;
+ sf.dmc.ss.ctr = tf-tf_ctr;
sf.dmc.ss.mq = 0; /* XXX */
/* XXX What should we do with th FP regs? */
@@ -154,18 +156,18 @@
}
/* Prepare registers */
- tf-fixreg[1] = (u_long)sfp;
- tf-fixreg[3] = (u_long)catcher;
+ tf-tf_fixreg[1] = (u_long)sfp;
+ tf-tf_fixreg[3] = (u_long)catcher;
if (SIGACTION(p, sig).sa_flags SA_SIGINFO)
- tf-fixreg[4] = 2; /* with siginfo */
+ tf-tf_fixreg[4] = 2; /* with siginfo */
else
- tf-fixreg[4] = 1; /* without siginfo */
- tf-fixreg[5] = (u_long)sig;
- tf-fixreg[6] = (u_long)sfp-duc.si;
- tf-fixreg[7] = (u_long)sfp-duc.uctx;
- tf-lr = (u_long)tf-srr0;
- tf-srr0 = (u_long)ps-sa_sigdesc[sig].sd_tramp;
- tf-srr1 = (PSL_EE | PSL_ME | PSL_IR | PSL_DR | PSL_PR);
+ tf-tf_fixreg[4] = 1; /* without siginfo */
+ tf-tf_fixreg[5] = (u_long)sig;
+ tf-tf_fixreg[6] = (u_long)sfp-duc.si;
+ tf-tf_fixreg[7] = (u_long)sfp-duc.uctx;
+ tf-tf_lr = (u_long)tf-tf_srr0;
+ tf-tf_srr0 = (u_long)ps-sa_sigdesc[sig].sd_tramp;
+ tf-tf_srr1 = (PSL_EE | PSL_ME | PSL_IR | PSL_DR | PSL_PR);
/* Remember that we're now on the signal stack. */
if (onstack)
@@ -214,22 +216,22 @@
tf = trapframe(l);
if (!PSL_USEROK_P(mctx.ss.srr1)) {
DPRINTF((uctx.ss.srr1 = 0x%08x, rf-srr1 = 0x%08lx\n,
- mctx.ss.srr1, tf-srr1));
+ mctx.ss.srr1, tf-tf_srr1));
return (EINVAL);
}
/* Restore the context */
- tf-dar = mctx.es.dar;
- tf-dsisr = mctx.es.dsisr;
- tf-exc = mctx.es.exception;
-
- tf-srr0 = mctx.ss.srr0;
- tf-srr1 = mctx.ss.srr1;
- memcpy(tf-fixreg[0], mctx.ss.gpreg[0], sizeof(mctx.ss.gpreg));
- tf-cr = mctx.ss.cr;
- tf-xer = mctx.ss.xer;
- tf-lr = mctx.ss.lr;
- tf-ctr = mctx.ss.ctr;
+ tf-tf_dar = mctx.es.dar;
+ tf-tf_dsisr = mctx.es.dsisr;
+ tf-tf_exc = mctx.es.exception;
+
+ tf-tf_srr0 = mctx.ss.srr0;
+ tf-tf_srr1 = mctx.ss.srr1;
+ memcpy(tf-tf_fixreg[0], mctx.ss.gpreg[0], sizeof(mctx.ss.gpreg));
+ tf-tf_cr = mctx.ss.cr;
+ tf-tf_xer = mctx.ss.xer;
+ tf-tf_lr = mctx.ss.lr;
+ tf-tf_ctr = mctx.ss.ctr;
/* Restore signal stack */
if (uctx.uc_onstack SS_ONSTACK)
@@ -286,8 +288,8 @@
child_return(arg);
- tf-fixreg[FIRSTARG] = p-p_pid;
- tf-srr0 +=4;
+ tf-tf_fixreg[FIRSTARG] = p-p_pid;
+ tf-tf_srr0 +=4;
return;
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Sat Feb 26 05:38:44 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Read instructions... Don't remove the ssp/h_raw entries, just mark them as obsolete To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.255 src/distrib/sets/lists/tests/mi:1.256 --- src/distrib/sets/lists/tests/mi:1.255 Sat Feb 26 02:41:56 2011 +++ src/distrib/sets/lists/tests/mi Sat Feb 26 05:38:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.255 2011/02/26 02:41:56 pgoyette Exp $ +# $NetBSD: mi,v 1.256 2011/02/26 05:38:44 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -372,6 +372,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memcpy.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memmove.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memset.debug tests-lib-debug debug,atf,ssp +./usr/libdata/debug/usr/tests/lib/libc/ssp/h_raw.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_read.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_readlink.debug tests-lib-debug debug,atf,ssp ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_snprintf.debug tests-lib-debug debug,atf,ssp @@ -1775,6 +1776,7 @@ ./usr/tests/lib/libc/ssp/h_memcpy tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_memmove tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_memset tests-lib-tests atf,ssp +./usr/tests/lib/libc/ssp/h_raw tests-obsolete obsolete ./usr/tests/lib/libc/ssp/h_read tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_readlink tests-lib-tests atf,ssp ./usr/tests/lib/libc/ssp/h_snprintf tests-lib-tests atf,ssp
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:52:32 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: (Attempt to) bundle some stw/ldws and remove redundant CR_TLS save. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/trap.S diff -u src/sys/arch/hppa/hppa/trap.S:1.55 src/sys/arch/hppa/hppa/trap.S:1.56 --- src/sys/arch/hppa/hppa/trap.S:1.55 Thu Feb 24 08:57:39 2011 +++ src/sys/arch/hppa/hppa/trap.S Sat Feb 26 07:52:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.S,v 1.55 2011/02/24 08:57:39 skrll Exp $ */ +/* $NetBSD: trap.S,v 1.56 2011/02/26 07:52:32 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -508,13 +508,13 @@ mtctl %t2, %pidr4 #endif ldw TF_CR27(%sr3, %t3), %t1 + ldw TF_CR30(%sr3, %t3), %t2 mtctl %t1, CR_TLS + mtctl %t2, CR_FPPADDR ldw TF_CR0(%sr3, %t3), %t1 mtctl %t1, %rctr - ldw TF_CR30(%sr3, %t3), %t1 - mtctl %t1, CR_FPPADDR GET_CURCPU_SPACE(%sr3, %t3) @@ -2091,9 +2091,6 @@ stw %t1, TF_SR7(%sr3, %t3) stw %t2, TF_CR9(%sr3, %t3) - mfctl CR_TLS, %t1 - stw %t1, TF_CR27(%sr3, %t3) - mtsp %r0, %sr0 mtsp %r0, %sr1 mtsp %r0, %sr2 @@ -2201,10 +2198,10 @@ stw %t1, TF_CR24(%t3) stw %t2, TF_CR28(%t3) - mfctl CR_TLS, %t1 - stw %t1, TF_CR27(%t3) #endif + mfctl CR_TLS, %t1 mfctl CR_FPPADDR, %t2 + stw %t1, TF_CR27(%t3) stw %t2, TF_CR30(%t3) /*
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:53:47 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Add a comment. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/trap.S diff -u src/sys/arch/hppa/hppa/trap.S:1.56 src/sys/arch/hppa/hppa/trap.S:1.57 --- src/sys/arch/hppa/hppa/trap.S:1.56 Sat Feb 26 07:52:32 2011 +++ src/sys/arch/hppa/hppa/trap.S Sat Feb 26 07:53:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.S,v 1.56 2011/02/26 07:52:32 skrll Exp $ */ +/* $NetBSD: trap.S,v 1.57 2011/02/26 07:53:47 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -2233,6 +2233,7 @@ bb,=,n %arg0, TFF_LAST_POS, L$trap_return nop + /* load curlwp's trapframe pointer */ GET_CURLWP(%t2) ldw L_MD(%t2), %t3
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:54:48 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/trap.S diff -u src/sys/arch/hppa/hppa/trap.S:1.57 src/sys/arch/hppa/hppa/trap.S:1.58 --- src/sys/arch/hppa/hppa/trap.S:1.57 Sat Feb 26 07:53:47 2011 +++ src/sys/arch/hppa/hppa/trap.S Sat Feb 26 07:54:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.S,v 1.57 2011/02/26 07:53:47 skrll Exp $ */ +/* $NetBSD: trap.S,v 1.58 2011/02/26 07:54:48 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -515,7 +515,6 @@ ldw TF_CR0(%sr3, %t3), %t1 mtctl %t1, %rctr - GET_CURCPU_SPACE(%sr3, %t3) /*
CVS commit: src/sys/net80211
Module Name:src Committed By: cegger Date: Fri Feb 25 08:01:49 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: sync with FreeBSD rev 1.11. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/net80211/ieee80211_radiotap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: cegger Date: Fri Feb 25 08:04:18 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: fix botched line break. How did this even compile for me? To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211_radiotap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jruoho Date: Fri Feb 25 09:16:00 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.h acpi_cpu_pstate.c Log Message: Add preliminary support for the IA32_APERF and IA32_MPERF frequency counters. These are not yet used for anything and only Intel is supported at the moment. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_cpu.h cvs rdiff -u -r1.38 -r1.39 src/sys/dev/acpi/acpi_cpu_pstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/darwin
Module Name:src Committed By: kiyohara Date: Fri Feb 25 09:54:23 UTC 2011 Modified Files: src/sys/compat/darwin: darwin_exec.c Log Message: Fix build failed. Need separator `,'. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/compat/darwin/darwin_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/bebox/stand
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:06:24 UTC 2011 Modified Files: src/sys/arch/bebox/stand: README Log Message: Update description to latest boot. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/bebox/stand/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:12:44 UTC 2011 Modified Files: src/sys/arch/bebox/stand/boot: prf.c tgets.c Log Message: Style. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/bebox/stand/boot/prf.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/bebox/stand/boot/tgets.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:16:59 UTC 2011 Modified Files: src/sys/arch/evbppc/obs405: obs600_autoconf.c Log Message: Fix UIC cascading. UIC1 to IRQ 30, UIC2 to 28. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/obs405/obs600_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: kiyohara Date: Fri Feb 25 10:18:09 UTC 2011 Modified Files: src/sys/arch/evbppc/obs405: obs600_machdep.c Log Message: Need splraise(-1) here. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/obs405/obs600_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: tron Date: Fri Feb 25 10:45:57 UTC 2011 Modified Files: src/sys/net80211: ieee80211_radiotap.h Log Message: Remove duplicate definitions which break the build. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211_radiotap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 10:59:32 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: Add support for APERF and MPERF on AMD processors. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x86/acpi/acpi_cpu_md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: tsutsui Date: Fri Feb 25 11:44:56 UTC 2011 Modified Files: src/sys/arch/mips/mips: fp.S Log Message: Fix cvt.d.s per analysis by Marcus Comstedt in PR port-mips/36251. Confirmed on ews4800mips. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mips/mips/fp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/mips/softfloat
Module Name:src Committed By: pooka Date: Fri Feb 25 11:53:07 UTC 2011 Modified Files: src/lib/libc/arch/mips/softfloat: mips-gcc.h Log Message: Fix LE softfloat (mostly theoretical) and comment. from Alessandro Forin To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/mips/softfloat/mips-gcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/mips/softfloat
Module Name:src Committed By: pooka Date: Fri Feb 25 11:55:28 UTC 2011 Modified Files: src/lib/libc/arch/mips/softfloat: mips-gcc.h Log Message: fix my whitespace copypaste To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/mips/softfloat/mips-gcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jruoho Date: Fri Feb 25 12:08:35 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c Log Message: Rename couple of badly named functions for consistency. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/acpi_cpu.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_cpu.h cvs rdiff -u -r1.44 -r1.45 src/sys/dev/acpi/acpi_cpu_cstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 16:54:36 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: Also declare support for APERF/MPERF during the BIOS _PDC/_OSC query. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/acpi/acpi_cpu_md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 17:07:30 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: Add couple of comments. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/acpi/acpi_cpu_md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 17:23:35 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: Fix an oversigh; the APERF and MPERF counters are per-CPU, so also reset these by broadcasting to all CPUs with x86_msr_xcall(9). To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/acpi/acpi_cpu_md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/ssp
Module Name:src Committed By: pgoyette Date: Fri Feb 25 18:11:53 UTC 2011 Modified Files: src/tests/lib/libc/ssp: t_ssp.sh Log Message: Disable the raw test case. The test is bogus, and did not work before conversion from src/regress/ to atf To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/ssp/t_ssp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Fri Feb 25 18:29:01 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: support mknod. from riz To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Fri Feb 25 18:36:37 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: whoops, didn't mean to delete futimes in previous. also from riz To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Fri Feb 25 18:48:26 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Fix powernow section in xref. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/acpicpu.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Fri Feb 25 18:56:21 UTC 2011 Modified Files: src/sys/rump/librump/rumpkern: devsw.c Log Message: Don't autogenerate a large number of unnecessary device nodes, just slows bootstrap. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/devsw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libaudio
Module Name:src Committed By: riz Date: Fri Feb 25 19:27:05 UTC 2011 Modified Files: src/sys/rump/dev/lib/libaudio: component.c Log Message: Use AUDIO_DEVICE instead of 0 as the minor number for /dev/audio since 0 is incorrect. While I'm here, add /dev/sound, audioctl, and mixer too. ok pooka@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libaudio/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: tsutsui Date: Fri Feb 25 19:32:51 UTC 2011 Modified Files: src/sys/arch/mips/mips: pmap.c Log Message: Fix LOCKDEBUG spin lock held panic on MIPS_CACHE_VIRTUAL_ALIAS CPUs. Now cobalt boots multiuser, but many programs complains clntudp_create: RPC: Program not registered as well as R5000 sgimips O2. Smells virtual cache alias issue around pool... To generate a diff of this commit: cvs rdiff -u -r1.195 -r1.196 src/sys/arch/mips/mips/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 19:55:07 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c acpi_cpu_pstate.c acpi_cpu_tstate.c Log Message: Start to derive the percpu(9) (or per-domain) state coordination mechanisms by parsing the _CSD, _PSD, and _TSD objects by default. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_cpu.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_cpu.h cvs rdiff -u -r1.45 -r1.46 src/sys/dev/acpi/acpi_cpu_cstate.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/acpi/acpi_cpu_pstate.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/acpi/acpi_cpu_tstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: drochner Date: Fri Feb 25 20:13:10 UTC 2011 Modified Files: src/share/man/man4: crypto.4 src/sys/netipsec: xform.h xform_esp.c src/sys/opencrypto: cryptodev.h cryptosoft.c xform.c xform.h Log Message: make the use of SHA2-HMAC by FAST_IPSEC compliant to current standards: -RFC2104 says that the block size of the hash algorithm must be used for key/ipad/opad calculations. While formerly all ciphers used a block length of 64, SHA384 and SHA512 use 128 bytes. So we can't use the HMAC_BLOCK_LEN constant anymore. Add a new field to struct auth_hash for the per-cipher blocksize. -Due to this, there can't be a single CRYPTO_SHA2_HMAC external name anymore. Replace this by 3 for the 3 different keysizes. This was done by Open/FreeBSD before. -Also fix the number of authenticator bits used tor ESP and AH to conform to RFC4868, and remove uses of AH_HMAC_HASHLEN which did assume a fixed authenticator size of 12 bytes. FAST_IPSEC will not interoperate with KAME IPSEC anymore if sha2 is used, because the latter doesn't implement these standards. It should interoperate with at least modern Free/OpenBSD now. (I've only tested with NetBSD-current/FAST_IPSEC on both ends.) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/crypto.4 cvs rdiff -u -r1.6 -r1.7 src/sys/netipsec/xform.h cvs rdiff -u -r1.29 -r1.30 src/sys/netipsec/xform_esp.c cvs rdiff -u -r1.18 -r1.19 src/sys/opencrypto/cryptodev.h cvs rdiff -u -r1.28 -r1.29 src/sys/opencrypto/cryptosoft.c cvs rdiff -u -r1.19 -r1.20 src/sys/opencrypto/xform.c cvs rdiff -u -r1.11 -r1.12 src/sys/opencrypto/xform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/hfs
Module Name:src Committed By: martin Date: Fri Feb 25 20:54:18 UTC 2011 Modified Files: src/tests/fs/hfs: t_pathconvert.c Log Message: Remove xfail for sparc64, alignement issues have been fixed To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/fs/hfs/t_pathconvert.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Feb 25 20:59:38 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu.h Log Message: Comment the coordination types. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/acpi_cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Feb 25 21:10:33 UTC 2011 Modified Files: src/share/man/man4: crypto.4 Log Message: Bump date for new crypto types. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/crypto.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/pcictl
Module Name:src Committed By: jmcneill Date: Fri Feb 25 21:40:48 UTC 2011 Modified Files: src/usr.sbin/pcictl: pcictl.8 pcictl.c Log Message: make pcictl pci0 list dump all busses by default, unless a bus number is specified with -b To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/pcictl/pcictl.8 cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/pcictl/pcictl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Sat Feb 26 05:38:44 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Read instructions... Don't remove the ssp/h_raw entries, just mark them as obsolete To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:52:32 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: (Attempt to) bundle some stw/ldws and remove redundant CR_TLS save. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:53:47 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Add a comment. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat Feb 26 07:54:48 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
