CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: dholland
Date: Sun Aug 26 02:32:14 UTC 2012
Modified Files:
src/sys/ufs/ufs: quota.h quota1.h ufs_quota.c
Log Message:
Move INITQFNAMES to the right header file.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ufs/quota.h
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/quota1.h
cvs rdiff -u -r1.110 -r1.111 src/sys/ufs/ufs/ufs_quota.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/ufs/ufs/quota.h
diff -u src/sys/ufs/ufs/quota.h:1.29 src/sys/ufs/ufs/quota.h:1.30
--- src/sys/ufs/ufs/quota.h:1.29 Sun Jan 29 07:16:00 2012
+++ src/sys/ufs/ufs/quota.h Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.h,v 1.29 2012/01/29 07:16:00 dholland Exp $ */
+/* $NetBSD: quota.h,v 1.30 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -53,6 +53,14 @@
#define USRQUOTA 0 /* element used for user quotas */
#define GRPQUOTA 1 /* element used for group quotas */
+/*
+ * Initializer for the strings corresponding to the quota ID types.
+ * (in quota1 these are also the default names of the quota files)
+ */
+#define INITQFNAMES { \
+ "user", /* USRQUOTA */ \
+ "group", /* GRPQUOTA */ \
+}
#if !defined(HAVE_NBTOOL_CONFIG_H)
#include
Index: src/sys/ufs/ufs/quota1.h
diff -u src/sys/ufs/ufs/quota1.h:1.6 src/sys/ufs/ufs/quota1.h:1.7
--- src/sys/ufs/ufs/quota1.h:1.6 Sun Jan 29 06:23:20 2012
+++ src/sys/ufs/ufs/quota1.h Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota1.h,v 1.6 2012/01/29 06:23:20 dholland Exp $ */
+/* $NetBSD: quota1.h,v 1.7 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -47,14 +47,6 @@
*/
/*
- * Definitions for the default names of the quotas files/quota types.
- */
-#define INITQFNAMES { \
- "user", /* USRQUOTA */ \
- "group", /* GRPQUOTA */ \
-}
-
-/*
* Definitions for disk quotas imposed on the average user
* (big brother finally hits UNIX).
*
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.110 src/sys/ufs/ufs/ufs_quota.c:1.111
--- src/sys/ufs/ufs/ufs_quota.c:1.110 Sun Jul 29 08:32:27 2012
+++ src/sys/ufs/ufs/ufs_quota.c Sun Aug 26 02:32:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.110 2012/07/29 08:32:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.111 2012/08/26 02:32:14 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,
#include
#include
-#include /* for INITQFNAMES; should be moved to quota.h */
#include
#include
#include
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jakllsch Date: Sun Aug 26 02:32:00 UTC 2012 Modified Files: src/sys/arch/arm/broadcom: bcm2835reg.h Log Message: Add some more peripheral base addresses, mapping sizes, and interrupt bits. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835reg.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/arm/broadcom/bcm2835reg.h diff -u src/sys/arch/arm/broadcom/bcm2835reg.h:1.2 src/sys/arch/arm/broadcom/bcm2835reg.h:1.3 --- src/sys/arch/arm/broadcom/bcm2835reg.h:1.2 Mon Aug 20 07:45:24 2012 +++ src/sys/arch/arm/broadcom/bcm2835reg.h Sun Aug 26 02:32:00 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835reg.h,v 1.2 2012/08/20 07:45:24 skrll Exp $ */ +/* $NetBSD: bcm2835reg.h,v 1.3 2012/08/26 02:32:00 jakllsch Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -42,15 +42,34 @@ #define BCM2835_PERIPHERALS_SIZE 0x0100 /* 16MBytes */ #define BCM2835_STIMER_BASE (BCM2835_PERIPHERALS_BASE + 0x3000) +#define BCM2835_DMA0_BASE (BCM2835_PERIPHERALS_BASE + 0x7000) #define BCM2835_ARM_BASE (BCM2835_PERIPHERALS_BASE + 0xB000) #define BCM2835_PM_BASE (BCM2835_PERIPHERALS_BASE + 0x0010) +#define BCM2835_GPIO_BASE (BCM2835_PERIPHERALS_BASE + 0x0020) #define BCM2835_UART0_BASE (BCM2835_PERIPHERALS_BASE + 0x00201000) +#define BCM2835_PCM_BASE (BCM2835_PERIPHERALS_BASE + 0x00203000) +#define BCM2835_SPI0_BASE (BCM2835_PERIPHERALS_BASE + 0x00204000) +#define BCM2835_BSC0_BASE (BCM2835_PERIPHERALS_BASE + 0x00205000) +#define BCM2835_BSCSPISLV_BASE (BCM2835_PERIPHERALS_BASE + 0x00214000) +#define BCM2835_AUX_BASE (BCM2835_PERIPHERALS_BASE + 0x00215000) #define BCM2835_EMMC_BASE (BCM2835_PERIPHERALS_BASE + 0x0030) +#define BCM2835_BSC1_BASE (BCM2835_PERIPHERALS_BASE + 0x00804000) +#define BCM2835_BSC2_BASE (BCM2835_PERIPHERALS_BASE + 0x00805000) +#define BCM2835_USB_BASE (BCM2835_PERIPHERALS_BASE + 0x0098) +#define BCM2835_DMA15_BASE (BCM2835_PERIPHERALS_BASE + 0x00E05000) #define BCM2835_STIMER_SIZE 0x1c +#define BCM2835_DMA0_SIZE 0x1000 +#define BCM2835_ARM_SIZE 0x1000 #define BCM2835_PM_SIZE 0x1000 +#define BCM2835_GPIO_SIZE 0x1000 #define BCM2835_UART0_SIZE 0x90 +#define BCM2835_PCM_SIZE 0x1000 +#define BCM2835_SPI0_SIZE 0x1000 +#define BCM2835_BSC_SIZE 0x1000 +#define BCM2835_AUX_SIZE 0x1000 #define BCM2835_EMMC_SIZE 0x1000 +#define BCM2835_DMA15_SIZE 0x100 #define BCM2835_IOPHYSTOVIRT(a) \ ((0xf000 | (((a) & 0xf000) >> 4)) + ((a) & ~0xf000)) @@ -96,8 +115,17 @@ #define BCM2835_INT_USB (BCM2835_INT_GPU0BASE + 9) #define BCM2835_INT_DMA2 (BCM2835_INT_GPU0BASE + 18) #define BCM2835_INT_DMA3 (BCM2835_INT_GPU0BASE + 19) +#define BCM2835_INT_AUX (BCM2835_INT_GPU0BASE + 29) +#define BCM2835_INT_ARM (BCM2835_INT_GPU0BASE + 30) #define BCM2835_INT_GPU1BASE 32 +#define BCM2835_INT_GPIO0 (BCM2835_INT_GPU1BASE + 17) +#define BCM2835_INT_GPIO1 (BCM2835_INT_GPU1BASE + 18) +#define BCM2835_INT_GPIO2 (BCM2835_INT_GPU1BASE + 19) +#define BCM2835_INT_GPIO3 (BCM2835_INT_GPU1BASE + 20) +#define BCM2835_INT_BSC0 (BCM2835_INT_GPU1BASE + 21) +#define BCM2835_INT_SPI0 (BCM2835_INT_GPU1BASE + 22) +#define BCM2835_INT_PCM (BCM2835_INT_GPU1BASE + 23) #define BCM2835_INT_UART0 (BCM2835_INT_GPU1BASE + 25) #define BCM2835_INT_EMMC (BCM2835_INT_GPU1BASE + 30)
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jakllsch
Date: Sun Aug 26 01:04:03 UTC 2012
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
It turns out we're actually waiting for other processors to be unbusy, not busy.
Unbreaks ACPI suspend on uniprocessor. Probably fixes unnoticed bugs on MP.
Needs pullup to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/acpi/acpi_wakeup.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_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.31 src/sys/arch/x86/acpi/acpi_wakeup.c:1.32
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.31 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Sun Aug 26 01:04:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $");
#include
#include
@@ -320,7 +320,7 @@ acpi_md_sleep(int state)
/* Save and suspend Application Processors. */
x86_broadcast_ipi(X86_IPI_ACPI_CPU_SLEEP);
cid = cpu_index(curcpu());
- while (!kcpuset_isotherset(kcpuset_running, cid)) {
+ while (kcpuset_isotherset(kcpuset_running, cid)) {
delay(1);
}
#endif
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Sat Aug 25 22:21:16 UTC 2012
Modified Files:
src/share/mk: bsd.test.mk
Log Message:
Fix "make test" to actually print the desired message when atf-run fails.
It was being skipped due to the set -e in the code snippet and the failure
to properly capture atf-run's exit code.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.20 src/share/mk/bsd.test.mk:1.21
--- src/share/mk/bsd.test.mk:1.20 Fri Aug 24 20:28:19 2012
+++ src/share/mk/bsd.test.mk Sat Aug 25 22:21:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.20 2012/08/24 20:28:19 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.21 2012/08/25 22:21:16 jmmv Exp $
#
.include
@@ -139,8 +139,8 @@ test:
mkfifo ${_TESTS_FIFO}; \
cat ${_TESTS_FIFO} | tee ${_TESTS_LOG} | \
${TESTS_ENV} ${DESTDIR}/usr/bin/atf-report & \
- ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run >>${_TESTS_FIFO}; \
- result=$${?}; \
+ result=0; \
+ ${TESTS_ENV} ${DESTDIR}/usr/bin/atf-run >>${_TESTS_FIFO} || result=1; \
wait; \
rm -f ${_TESTS_FIFO}; \
echo; \
CVS commit: src/lib
Module Name:src
Committed By: pooka
Date: Sat Aug 25 18:00:06 UTC 2012
Modified Files:
src/lib/librumphijack: Makefile hijack.c hijackdlsym.c
src/lib/librumpuser: rumpuser.c rumpuser_port.h
Log Message:
Make librumphijack compile and work on Linux. Do not try to hijack
calls which are not supported on Linux and therefore cannot be
handled by the rump kernel side syscall emulation (not that they'd
be present in the calling binaries anyway).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.95 -r1.96 src/lib/librumphijack/hijack.c
cvs rdiff -u -r1.2 -r1.3 src/lib/librumphijack/hijackdlsym.c
cvs rdiff -u -r1.18 -r1.19 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/rumpuser_port.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/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.9 src/lib/librumphijack/Makefile:1.10
--- src/lib/librumphijack/Makefile:1.9 Wed Mar 21 05:37:44 2012
+++ src/lib/librumphijack/Makefile Sat Aug 25 18:00:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:44 matt Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/25 18:00:06 pooka Exp $
#
LIB= rumphijack
@@ -10,7 +10,7 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c
-CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
+CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -I${.CURDIR}/../librumpuser
WARNS?= 5
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.95 src/lib/librumphijack/hijack.c:1.96
--- src/lib/librumphijack/hijack.c:1.95 Sat Aug 4 03:56:47 2012
+++ src/lib/librumphijack/hijack.c Sat Aug 25 18:00:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.95 2012/08/04 03:56:47 riastradh Exp $ */
+/* $NetBSD: hijack.c,v 1.96 2012/08/25 18:00:06 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -28,22 +28,29 @@
/* Disable namespace mangling, Fortification is useless here anyway. */
#undef _FORTIFY_SOURCE
+#include "rumpuser_port.h"
+
#include
-__RCSID("$NetBSD: hijack.c,v 1.95 2012/08/04 03:56:47 riastradh Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.96 2012/08/25 18:00:06 pooka Exp $");
#include
#include
-#include
#include
#include
#include
#include
#include
+#include
#include
-#include
+#include
-#include
-#include
+#ifdef PLATFORM_HAS_KQUEUE
+#include
+#endif
+
+#ifdef PLATFORM_HAS_NBQUOTA
+#include
+#endif
#include
#include
@@ -55,14 +62,23 @@ __RCSID("$NetBSD: hijack.c,v 1.95 2012/0
#include
#include
#include
+#include
#include
#include
#include
#include
#include
+#include
+#include
+
#include "hijack.h"
+/*
+ * XXX: Consider autogenerating this, syscnames[] and syscalls[] with
+ * a DSL where the tool also checks the symbols exported by this library
+ * to make sure all relevant calls are accounted for.
+ */
enum dualcall {
DUALCALL_WRITE, DUALCALL_WRITEV, DUALCALL_PWRITE, DUALCALL_PWRITEV,
DUALCALL_IOCTL, DUALCALL_FCNTL,
@@ -81,7 +97,6 @@ enum dualcall {
DUALCALL_CHMOD, DUALCALL_LCHMOD, DUALCALL_FCHMOD,
DUALCALL_CHOWN, DUALCALL_LCHOWN, DUALCALL_FCHOWN,
DUALCALL_OPEN,
- DUALCALL_STATVFS1, DUALCALL_FSTATVFS1,
DUALCALL_CHDIR, DUALCALL_FCHDIR,
DUALCALL_LSEEK,
DUALCALL_GETDENTS,
@@ -90,16 +105,37 @@ enum dualcall {
DUALCALL_MKDIR, DUALCALL_RMDIR,
DUALCALL_UTIMES, DUALCALL_LUTIMES, DUALCALL_FUTIMES,
DUALCALL_TRUNCATE, DUALCALL_FTRUNCATE,
- DUALCALL_FSYNC, DUALCALL_FSYNC_RANGE,
- DUALCALL_MOUNT, DUALCALL_UNMOUNT,
+ DUALCALL_FSYNC,
DUALCALL___GETCWD,
- DUALCALL_CHFLAGS, DUALCALL_LCHFLAGS, DUALCALL_FCHFLAGS,
DUALCALL_ACCESS,
DUALCALL_MKNOD,
- DUALCALL___SYSCTL,
- DUALCALL_GETVFSSTAT, DUALCALL_NFSSVC,
DUALCALL_GETFH, DUALCALL_FHOPEN, DUALCALL_FHSTAT, DUALCALL_FHSTATVFS1,
-#if __NetBSD_Prereq__(5,99,48)
+
+#ifdef PLATFORM_HAS_NBSYSCTL
+ DUALCALL___SYSCTL,
+#endif
+
+#ifdef PLATFORM_HAS_NFSSVC
+ DUALCALL_NFSSVC,
+#endif
+
+#ifdef PLATFORM_HAS_NBVFSSTAT
+ DUALCALL_STATVFS1, DUALCALL_FSTATVFS1, DUALCALL_GETVFSSTAT,
+#endif
+
+#ifdef PLATFORM_HAS_NBMOUNT
+ DUALCALL_MOUNT, DUALCALL_UNMOUNT,
+#endif
+
+#ifdef PLATFORM_HAS_FSYNC_RANGE
+ DUALCALL_FSYNC_RANGE,
+#endif
+
+#ifdef PLATFORM_HAS_CHFLAGS
+ DUALCALL_CHFLAGS, DUALCALL_LCHFLAGS, DUALCALL_FCHFLAGS,
+#endif
+
+#ifdef PLATFORM_HAS_NBQUOTA
DUALCALL_QUOTACTL,
#endif
DUALCALL__NUM
@@ -112,6 +148,7 @@ enum dualcall {
* Would be nice to get this automatically in sync with libc.
* Also, this does not work for compat-using binaries!
*/
+#ifdef __NetBSD__
#if !__NetBSD_Prereq__(5,99,7)
#define REALSELECT select
#define REALPOLLTS pollts
@@ -124,7 +161,7 @@ enum dualcall {
#define REALFUTIMES futimes
#define REALMKNOD mknod
#define REALFHSTAT __fhstat40
-#else
+#else /* >= 5.99.7 */
#define REALSELECT _sys___select50
#define REALPOLLTS _sys___pollts50
#define REALKEVENT _sys___kevent50
@@
CVS commit: src/lib/csu/arch/arm
Module Name:src
Committed By: matt
Date: Sat Aug 25 15:39:05 UTC 2012
Modified Files:
src/lib/csu/arch/arm: crtbegin.S
Log Message:
Fix fini processing.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/csu/arch/arm/crtbegin.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/arm/crtbegin.S
diff -u src/lib/csu/arch/arm/crtbegin.S:1.3 src/lib/csu/arch/arm/crtbegin.S:1.4
--- src/lib/csu/arch/arm/crtbegin.S:1.3 Fri Aug 24 16:37:45 2012
+++ src/lib/csu/arch/arm/crtbegin.S Sat Aug 25 15:39:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crtbegin.S,v 1.3 2012/08/24 16:37:45 matt Exp $ */
+/* $NetBSD: crtbegin.S,v 1.4 2012/08/25 15:39:05 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include
-RCSID("$NetBSD: crtbegin.S,v 1.3 2012/08/24 16:37:45 matt Exp $")
+RCSID("$NetBSD: crtbegin.S,v 1.4 2012/08/25 15:39:05 matt Exp $")
.section .ctors, "aw", %progbits
.p2align 2
@@ -122,7 +122,7 @@ __do_global_dtors_aux:
add r4, r4, r7 /* addr = offset + got */
add r5, r5, r7 /* addr = offset + got */
#endif
- sub r5, r5, #4 /* skip first entry */
+ add r4, r4, #4 /* skip first entry */
1:
cmp r4, r5 /* end of list */
ldrne ip, [r4], #4 /* ip = *r4++; */
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: matt Date: Sat Aug 25 14:08:18 UTC 2012 Modified Files: src/sys/arch/arm/include/arm32: frame.h Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/arm32/frame.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/arm/include/arm32/frame.h diff -u src/sys/arch/arm/include/arm32/frame.h:1.31 src/sys/arch/arm/include/arm32/frame.h:1.32 --- src/sys/arch/arm/include/arm32/frame.h:1.31 Thu Aug 16 17:35:01 2012 +++ src/sys/arch/arm/include/arm32/frame.h Sat Aug 25 14:08:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.31 2012/08/16 17:35:01 matt Exp $ */ +/* $NetBSD: frame.h,v 1.32 2012/08/25 14:08:17 matt Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -143,7 +143,7 @@ void validate_trapframe(trapframe_t *, i teq r0, #(PSR_USR32_MODE) ;\ GET_CURCPU(r4) /* r4 = cpuinfo */ ;\ bne 1f /* Not USR mode skip AFLT */ ;\ - ldr r1, [r1, #CI_CURLWP] /* get curlwp from cpu_info */ ;\ + ldr r1, [r4, #CI_CURLWP] /* get curlwp from cpu_info */ ;\ ldr r1, [r1, #L_MD_FLAGS] /* Fetch l_md.md_flags */ ;\ tst r1, #MDLWP_NOALIGNFLT ;\ beq 1f /* AFLTs already enabled */ ;\
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: wiz
Date: Sat Aug 25 12:37:12 UTC 2012
Modified Files:
src/usr.sbin/makemandb: makemandb.c
Log Message:
Sync usage with manpage.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makemandb/makemandb.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/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.11 src/usr.sbin/makemandb/makemandb.c:1.12
--- src/usr.sbin/makemandb/makemandb.c:1.11 Sat Aug 11 21:07:13 2012
+++ src/usr.sbin/makemandb/makemandb.c Sat Aug 25 12:37:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.11 2012/08/11 21:07:13 wiz Exp $ */
+/* $NetBSD: makemandb.c,v 1.12 2012/08/25 12:37:12 wiz Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay
* Copyright (c) 2011 Kristaps Dzonsons
@@ -17,7 +17,7 @@
*/
#include
-__RCSID("$NetBSD: makemandb.c,v 1.11 2012/08/11 21:07:13 wiz Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.12 2012/08/25 12:37:12 wiz Exp $");
#include
#include
@@ -2036,6 +2036,6 @@ append(secbuff *sbuff, const char *src)
static void
usage(void)
{
- fprintf(stderr, "Usage: %s [-flo]\n", getprogname());
+ fprintf(stderr, "Usage: %s [-floqv] [-C path]\n", getprogname());
exit(1);
}
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: wiz Date: Sat Aug 25 12:37:00 UTC 2012 Modified Files: src/usr.sbin/makemandb: makemandb.8 Log Message: Sort options in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makemandb/makemandb.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/makemandb/makemandb.8 diff -u src/usr.sbin/makemandb/makemandb.8:1.3 src/usr.sbin/makemandb/makemandb.8:1.4 --- src/usr.sbin/makemandb/makemandb.8:1.3 Sun Apr 22 21:29:27 2012 +++ src/usr.sbin/makemandb/makemandb.8 Sat Aug 25 12:37:00 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: makemandb.8,v 1.3 2012/04/22 21:29:27 wiz Exp $ +.\" $NetBSD: makemandb.8,v 1.4 2012/08/25 12:37:00 wiz Exp $ .\" .\" Copyright (c) 2011 Abhinav Upadhyay .\" All rights reserved. @@ -37,8 +37,8 @@ .Nd parse the manual pages and build a search index over them .Sh SYNOPSIS .Nm -.Op Fl C Ar path .Op Fl floqv +.Op Fl C Ar path .Sh DESCRIPTION The .Nm
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Aug 25 11:14:58 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: update procedure for services and protocols, and bring them up-to-date To generate a diff of this commit: cvs rdiff -u -r1.960 -r1.961 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.960 src/doc/3RDPARTY:1.961 --- src/doc/3RDPARTY:1.960 Mon Aug 20 17:20:19 2012 +++ src/doc/3RDPARTY Sat Aug 25 07:14:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.960 2012/08/20 21:20:19 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.961 2012/08/25 11:14:58 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1236,10 +1236,10 @@ Notes: Imported to src/common/dist/zlib and shared by the kernel and userland. Package: services, protocols -Version: 2010-10-04 (services), 2010-05-27 (protocols) -Current Vers: 2012-01-04 (services), 2011-11-01 (protocols) +Version: 2012-08-24 (services), 2012-08-21 (protocols) +Current Vers: 2012-08-24 (services), 2012-08-21 (protocols) Maintainer: IANA -Archive Site: http://www.iana.org/assignments/port-numbers (services) +Archive Site: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt (services) Archive Site: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.txt (protocols) Home Page: http://www.iana.org/ Mailing List: @@ -1247,15 +1247,11 @@ Responsible: christos License: None Location: etc Notes: -1. Download the latest converter from: - http://www.sethwklein.net/iana-etc.html -2. Unpack it and edit the Makefile to reflect the latest location of the files -3. Run - gmake get - gmake -4. Add NetBSD rcsid to the generated protocols and services. -5. Append the local services from the current services file. -6. Run: +1. Build package net/iana-etc +2. Add NetBSD rcsid to the generated protocols and services in the package + work area. +3. Append the local services from the current services file. +4. Run: services_mkdb -u services > /usr/src/etc/services cp protocols /usr/src/etc/protocols
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Aug 25 11:14:34 UTC 2012 Modified Files: src/etc: protocols services Log Message: Fresh from IANA To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/etc/protocols cvs rdiff -u -r1.94 -r1.95 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
