CVS commit: [pgoyette-compat] src/sys/sys
Module Name:src Committed By: pgoyette Date: Sat Sep 15 05:57:51 UTC 2018 Modified Files: src/sys/sys [pgoyette-compat]: compat_stub.h Log Message: Remove stray '-' To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/sys/compat_stub.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/sys
Module Name:src Committed By: pgoyette Date: Sat Sep 15 05:57:51 UTC 2018 Modified Files: src/sys/sys [pgoyette-compat]: compat_stub.h Log Message: Remove stray '-' To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/sys/compat_stub.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/compat_stub.h diff -u src/sys/sys/compat_stub.h:1.1.2.16 src/sys/sys/compat_stub.h:1.1.2.17 --- src/sys/sys/compat_stub.h:1.1.2.16 Sat Sep 15 05:56:50 2018 +++ src/sys/sys/compat_stub.h Sat Sep 15 05:57:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.h,v 1.1.2.16 2018/09/15 05:56:50 pgoyette Exp $ */ +/* $NetBSD: compat_stub.h,v 1.1.2.17 2018/09/15 05:57:51 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ extern int (*vec_ntp_timestatus)(void); */ extern int (*compat_ccd_ioctl_60)(dev_t, u_long, void *, int, struct lwp *, --int (*f)(dev_t, u_long, void *, int, struct lwp *)); +int (*f)(dev_t, u_long, void *, int, struct lwp *)); /* * Routine vector for dev/clockctl ioctl()
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sat Sep 15 05:56:50 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Log Message:
Prepare for adding MP-safe stuff.
While here, move some header #includes
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/sys/compat_stub.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/kern/compat_stub.c
diff -u src/sys/kern/compat_stub.c:1.1.2.15 src/sys/kern/compat_stub.c:1.1.2.16
--- src/sys/kern/compat_stub.c:1.1.2.15 Tue Apr 17 07:24:55 2018
+++ src/sys/kern/compat_stub.c Sat Sep 15 05:56:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.c,v 1.1.2.15 2018/04/17 07:24:55 pgoyette Exp $ */
+/* $NetBSD: compat_stub.c,v 1.1.2.16 2018/09/15 05:56:50 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,6 +39,11 @@
#include
#include
+#ifdef NTP
+#include
+#include
+#endif
+
/*
* Routine vectors for compat_50___sys_ntp_gettime
*/
@@ -51,6 +56,11 @@ void (*vec_ntp_gettime)(struct ntptimeva
int (*vec_ntp_timestatus)(void) = NULL;
#endif
+#if NUSB > 0
+#include
+#include
+#endif
+
/*
* ccd device compatability ioctl
*/
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.15 src/sys/sys/compat_stub.h:1.1.2.16
--- src/sys/sys/compat_stub.h:1.1.2.15 Tue Apr 17 07:24:55 2018
+++ src/sys/sys/compat_stub.h Sat Sep 15 05:56:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.15 2018/04/17 07:24:55 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.1.2.16 2018/09/15 05:56:50 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,12 +32,37 @@
#ifndef _SYS_COMPAT_STUB_H
#define _SYS_COMPAT_STUB_H
+#include
+#include
+#include
+#include
+
+/*
+ * Macro for creating MP-safe vectored function calls
+ */
+#if defined(MODULAR)
+#define COMPAT_HOOK(name,type,args) \
+struct __CONCAT(name,_t) { \
+ kmutex_t lock; \
+ kcondvar_t cv; \
+ struct localcount lc; \
+ pserialize_t psz; \
+bool hooked; \
+ type (*func)(args); \
+} name __cacheline_aligned;
+#else /* defined(MODULAR) */
+#define COMPAT_HOOK(name,type.args) \
+struct __CONCAT(name,_t) { \
+bool hooked; \
+ type (*func)(args); \
+} name __cacheline_aligned;
+#endif /* defined(MODULAR) */
+
/*
* Routine vectors for compat_50___sys_ntp_gettime
*/
-#include
-#include
+struct ntptimeval;
extern void (*vec_ntp_gettime)(struct ntptimeval *);
extern int (*vec_ntp_timestatus)(void);
@@ -47,7 +72,7 @@ extern int (*vec_ntp_timestatus)(void);
*/
extern int (*compat_ccd_ioctl_60)(dev_t, u_long, void *, int, struct lwp *,
-int (*f)(dev_t, u_long, void *, int, struct lwp *));
+-int (*f)(dev_t, u_long, void *, int, struct lwp *));
/*
* Routine vector for dev/clockctl ioctl()
@@ -128,9 +153,6 @@ extern int (*compat_vndioctl_30)(u_long,
* usb devinfo compatability
*/
-#include
-#include
-
struct usbd_device;
struct usb_device_info;
struct usb_device_info_old;
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Sat Sep 15 05:56:50 UTC 2018 Modified Files: src/sys/kern [pgoyette-compat]: compat_stub.c src/sys/sys [pgoyette-compat]: compat_stub.h Log Message: Prepare for adding MP-safe stuff. While here, move some header #includes To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/kern/compat_stub.c cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/sys/compat_stub.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 15 02:14:39 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_09_mod.c compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c compat_16_mod.c compat_20_mod.c compat_30_mod.c compat_40_mod.c compat_50_mod.c compat_60_mod.c compat_70_mod.c compat_80_mod.c Log Message: Since we've already removed the maximum recursion depth for required modules, there's no need for us to force loading of the most-recent (ie, "deepest") modules first. So, simplify the required-modules lists to require only the next-highest version's module. This will also make it easier to add new compat_xx modules for future release versions. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/compat_09_mod.c \ src/sys/compat/common/compat_10_mod.c \ src/sys/compat/common/compat_14_mod.c \ src/sys/compat/common/compat_16_mod.c \ src/sys/compat/common/compat_20_mod.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/compat_12_mod.c \ src/sys/compat/common/compat_13_mod.c \ src/sys/compat/common/compat_40_mod.c cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/compat_30_mod.c cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/compat/common/compat_60_mod.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_70_mod.c \ src/sys/compat/common/compat_80_mod.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/common/compat_09_mod.c diff -u src/sys/compat/common/compat_09_mod.c:1.1.2.3 src/sys/compat/common/compat_09_mod.c:1.1.2.4 --- src/sys/compat/common/compat_09_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_09_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -69,12 +69,8 @@ compat_09_fini(void) return 0; } -#define REQD_09_1 "compat_80,compat_70,compat_60,compat_50," -#define REQD_09_2 "compat_40,compat_30,compat_20,compat_16," -#define REQD_09_3 "compat_14,compat_13,compat_12,compat_10," -#define REQD_09_4 "compat_util,compat_sysctl_09_43" - -MODULE(MODULE_CLASS_EXEC, compat_09, REQD_09_1 REQD_09_2 REQD_09_3 REQD_09_4); +MODULE(MODULE_CLASS_EXEC, compat_09, +"compat_10,compat_util,compat_sysctl_09_43"); static int compat_09_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/common/compat_10_mod.c diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.3 src/sys/compat/common/compat_10_mod.c:1.1.2.4 --- src/sys/compat/common/compat_10_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_10_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -62,11 +62,7 @@ compat_10_fini(void) return 0; } -#define REQD_10_1 "compat_80,compat_70,compat_60,compat_50," -#define REQD_10_2 "compat_40,compat_30,compat_20,compat_16," -#define REQD_10_3 "compat_14,compat_13,compat_12,compat_util" - -MODULE(MODULE_CLASS_EXEC, compat_10, REQD_10_1 REQD_10_2 REQD_10_3); +MODULE(MODULE_CLASS_EXEC, compat_10, "compat_12,compat_util"); static int compat_10_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/common/compat_14_mod.c diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.3 src/sys/compat/common/compat_14_mod.c:1.1.2.4 --- src/sys/compat/common/compat_14_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_14_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -62,10 +62,7 @@ compat_14_fini(void) return 0; } -#define REQD_14_1
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 15 02:14:39 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_09_mod.c compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c compat_16_mod.c compat_20_mod.c compat_30_mod.c compat_40_mod.c compat_50_mod.c compat_60_mod.c compat_70_mod.c compat_80_mod.c Log Message: Since we've already removed the maximum recursion depth for required modules, there's no need for us to force loading of the most-recent (ie, "deepest") modules first. So, simplify the required-modules lists to require only the next-highest version's module. This will also make it easier to add new compat_xx modules for future release versions. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/compat_09_mod.c \ src/sys/compat/common/compat_10_mod.c \ src/sys/compat/common/compat_14_mod.c \ src/sys/compat/common/compat_16_mod.c \ src/sys/compat/common/compat_20_mod.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/compat_12_mod.c \ src/sys/compat/common/compat_13_mod.c \ src/sys/compat/common/compat_40_mod.c cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/compat_30_mod.c cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/compat/common/compat_60_mod.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_70_mod.c \ src/sys/compat/common/compat_80_mod.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/sgimips/hpc
Module Name:src Committed By: macallan Date: Sat Sep 15 01:05:07 UTC 2018 Modified Files: src/sys/arch/sgimips/hpc: hpc.c Log Message: remove long unused power button handler To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sgimips/hpc/hpc.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/sgimips/hpc
Module Name:src
Committed By: macallan
Date: Sat Sep 15 01:05:07 UTC 2018
Modified Files:
src/sys/arch/sgimips/hpc: hpc.c
Log Message:
remove long unused power button handler
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sgimips/hpc/hpc.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/sgimips/hpc/hpc.c
diff -u src/sys/arch/sgimips/hpc/hpc.c:1.70 src/sys/arch/sgimips/hpc/hpc.c:1.71
--- src/sys/arch/sgimips/hpc/hpc.c:1.70 Sat Sep 15 00:37:53 2018
+++ src/sys/arch/sgimips/hpc/hpc.c Sat Sep 15 01:05:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc.c,v 1.70 2018/09/15 00:37:53 macallan Exp $ */
+/* $NetBSD: hpc.c,v 1.71 2018/09/15 01:05:06 macallan Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.70 2018/09/15 00:37:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.71 2018/09/15 01:05:06 macallan Exp $");
#include
#include
@@ -347,9 +347,6 @@ static struct hpc_values hpc3_values = {
.scsi_dmactl_reset = HPC3_SCSI_DMACTL_RESET
};
-
-static int powerintr_established;
-
static int hpc_match(device_t, cfdata_t, void *);
static void hpc_attach(device_t, device_t, void *);
static int hpc_print(void *, const char *);
@@ -547,19 +544,6 @@ hpc_attach(device_t parent, device_t sel
}
}
- /*
- * XXX: Only attach the powerfail interrupt once, since the
- * interrupt code doesn't let you share interrupt just yet.
- *
- * Since the powerfail interrupt is hardcoded to read from
- * a specific register anyway (XXX#2!), we don't care when
- * it gets attached, as long as it only happens once.
- */
- if (mach_type == MACH_SGI_IP22 && !powerintr_established) {
-// cpu_intr_establish(9, IPL_NONE, hpc_power_intr, sc);
- powerintr_established++;
- }
-
#if defined(BLINK)
if (mach_type == MACH_SGI_IP12 || mach_type == MACH_SGI_IP20)
hpc_blink(sc);
@@ -672,24 +656,6 @@ hpc_print(void *aux, const char *pnp)
return (UNCONF);
}
-#if 0
-static int
-hpc_power_intr(void *arg)
-{
- uint32_t pwr_reg;
-
- pwr_reg = *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850));
- *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9850)) = pwr_reg;
-
- printf("hpc_power_intr: panel reg = %08x\n", pwr_reg);
-
- if (pwr_reg & 2)
- cpu_reboot(RB_HALT, NULL);
-
- return 1;
-}
-#endif
-
#if defined(BLINK)
static void
hpc_blink(void *arg)
CVS commit: src/sys/arch/sgimips/hpc
Module Name:src
Committed By: macallan
Date: Sat Sep 15 00:37:53 UTC 2018
Modified Files:
src/sys/arch/sgimips/hpc: hpc.c
Log Message:
one more s/panel/button, now this actually works again.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sgimips/hpc/hpc.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/sgimips/hpc/hpc.c
diff -u src/sys/arch/sgimips/hpc/hpc.c:1.69 src/sys/arch/sgimips/hpc/hpc.c:1.70
--- src/sys/arch/sgimips/hpc/hpc.c:1.69 Sun Jul 24 16:47:49 2016
+++ src/sys/arch/sgimips/hpc/hpc.c Sat Sep 15 00:37:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc.c,v 1.69 2016/07/24 16:47:49 macallan Exp $ */
+/* $NetBSD: hpc.c,v 1.70 2018/09/15 00:37:53 macallan Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.69 2016/07/24 16:47:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.70 2018/09/15 00:37:53 macallan Exp $");
#include
#include
@@ -201,7 +201,7 @@ static const struct hpc_device hpc3_devi
-1,
HPCDEV_IP22 | HPCDEV_IP24 },
- { "panel", /* Indy front panel */
+ { "button", /* Indy front panel */
HPC_BASE_ADDRESS_0,
HPC3_PBUS_CH6_DEVREGS + IOC_PANEL, 0,
9,
CVS commit: src/sys/arch/sgimips/hpc
Module Name:src Committed By: macallan Date: Sat Sep 15 00:37:53 UTC 2018 Modified Files: src/sys/arch/sgimips/hpc: hpc.c Log Message: one more s/panel/button, now this actually works again. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sgimips/hpc/hpc.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/evbarm/fdt
Module Name:src Committed By: jakllsch Date: Fri Sep 14 22:08:49 UTC 2018 Modified Files: src/sys/arch/evbarm/fdt: fdt_machdep.c Log Message: fdt_cpu_rootconf: fix root on wd(4) Remove duplicate 'ld' and replace with previously-missing 'wd'. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/fdt/fdt_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/evbarm/fdt/fdt_machdep.c diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.35 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.36 --- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.35 Fri Sep 7 17:21:58 2018 +++ src/sys/arch/evbarm/fdt/fdt_machdep.c Fri Sep 14 22:08:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_machdep.c,v 1.35 2018/09/07 17:21:58 jmcneill Exp $ */ +/* $NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.35 2018/09/07 17:21:58 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $"); #include "opt_machdep.h" #include "opt_bootconfig.h" @@ -634,7 +634,7 @@ fdt_cpu_rootconf(void) if (get_bootconf_option(boot_args, "root", BOOTOPT_TYPE_STRING, ) != 0) break; - if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "ld")) + if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "wd")) fdt_detect_root_device(dev); } deviter_release();
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src Committed By: jakllsch Date: Fri Sep 14 22:08:49 UTC 2018 Modified Files: src/sys/arch/evbarm/fdt: fdt_machdep.c Log Message: fdt_cpu_rootconf: fix root on wd(4) Remove duplicate 'ld' and replace with previously-missing 'wd'. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/fdt/fdt_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/stand/efiboot
Module Name:src
Committed By: jakllsch
Date: Fri Sep 14 21:37:03 UTC 2018
Modified Files:
src/sys/stand/efiboot: efiblock.c
Log Message:
MI efiboot: avoid LBA overflow in efi_block_find_partitions_disklabel()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/efiblock.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/stand/efiboot/efiblock.c
diff -u src/sys/stand/efiboot/efiblock.c:1.2 src/sys/stand/efiboot/efiblock.c:1.3
--- src/sys/stand/efiboot/efiblock.c:1.2 Mon Aug 27 09:51:32 2018
+++ src/sys/stand/efiboot/efiblock.c Fri Sep 14 21:37:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efiblock.c,v 1.2 2018/08/27 09:51:32 jmcneill Exp $ */
+/* $NetBSD: efiblock.c,v 1.3 2018/09/14 21:37:03 jakllsch Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -115,7 +115,7 @@ efi_block_find_partitions_disklabel(stru
if (!buf)
return ENOMEM;
- lba = ((start + LABELSECTOR) * DEV_BSIZE) / bdev->bio->Media->BlockSize;
+ lba = (((EFI_LBA)start + LABELSECTOR) * DEV_BSIZE) / bdev->bio->Media->BlockSize;
status = uefi_call_wrapper(bdev->bio->ReadBlocks, 5, bdev->bio, bdev->media_id, lba, sz, buf);
if (EFI_ERROR(status) || getdisklabel(buf, ) != NULL) {
FreePool(buf);
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: jakllsch Date: Fri Sep 14 21:37:03 UTC 2018 Modified Files: src/sys/stand/efiboot: efiblock.c Log Message: MI efiboot: avoid LBA overflow in efi_block_find_partitions_disklabel() To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/efiblock.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/man3
Module Name:src
Committed By: christos
Date: Fri Sep 14 20:53:49 UTC 2018
Modified Files:
src/share/man/man3: attribute.3
Log Message:
PR/53608: Ian Bruene: document __{printf,syslog}like.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man3/attribute.3
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/man3/attribute.3
diff -u src/share/man/man3/attribute.3:1.17 src/share/man/man3/attribute.3:1.18
--- src/share/man/man3/attribute.3:1.17 Fri Sep 14 16:38:38 2018
+++ src/share/man/man3/attribute.3 Fri Sep 14 16:53:49 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: attribute.3,v 1.17 2018/09/14 20:38:38 joerg Exp $
+.\" $NetBSD: attribute.3,v 1.18 2018/09/14 20:53:49 christos Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 25, 2013
+.Dd September 14, 2018
.Dt ATTRIBUTE 3
.Os
.Sh NAME
@@ -64,6 +64,10 @@
.Fn __predict_true "exp"
.Pp
.Fn __predict_false "exp"
+.Pp
+.Fn __printflike "fmtarg" "firstvararg"
+.Pp
+.Fn __sysloglike "fmtarg" "firstvararg"
.Sh DESCRIPTION
As an extension to the C standard, some compilers allow non-standard
attributes to be associated with functions, variables, or types, to
@@ -357,6 +361,22 @@ empirical evidence should precede the us
.Ic __predict_false
and
.Ic __predict_true .
+.It Fn __printflike "fmtarg" "firstvararg"
+Marks a function as taking printf-like arguments.
+.Fa fmtarg
+is the index of the format string in the argument list, and
+.Fa firstvararg
+is the index of the first item of the vararg list.
+.It Fn __sysloglike "fmtarg" "firstvararg"
+Marks a function as taking syslog-like arguments.
+Allows use of the %m formatting code.
+.Fa fmtarg
+is the index of the format string in the argument list, and
+.Fa firstvararg
+is the index of the first item of the vararg list, or
+.Dv 0
+if the argument is a
+.Ft va_list .
.El
.Sh SEE ALSO
.Xr clang 1 ,
CVS commit: src/share/man/man3
Module Name:src
Committed By: christos
Date: Fri Sep 14 20:53:49 UTC 2018
Modified Files:
src/share/man/man3: attribute.3
Log Message:
PR/53608: Ian Bruene: document __{printf,syslog}like.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man3/attribute.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/c-family
Module Name:src
Committed By: christos
Date: Fri Sep 14 20:47:32 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/gcc/c-family: c-format.c c-format.h
Log Message:
The syslog format attribute is a superset of the printf format attribute
so allow functions marked with the printf format attribute to call syslog
without producing warnings with -Wmissing-format-attribute.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/c-family/c-format.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/c-family/c-format.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/c-family/c-format.c
diff -u src/external/gpl3/gcc/dist/gcc/c-family/c-format.c:1.5 src/external/gpl3/gcc/dist/gcc/c-family/c-format.c:1.6
--- src/external/gpl3/gcc/dist/gcc/c-family/c-format.c:1.5 Thu Feb 1 22:41:04 2018
+++ src/external/gpl3/gcc/dist/gcc/c-family/c-format.c Fri Sep 14 16:47:32 2018
@@ -887,70 +887,70 @@ static const format_kind_info format_typ
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L', 0,
-_type_node, _type_node
+_type_node, _type_node, format_type_error
},
{ "asm_fprintf", asm_fprintf_length_specs, asm_fprintf_char_table, " +#0-", NULL,
asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L', 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gcc_diag", gcc_diag_length_specs, gcc_diag_char_table, "q+#", NULL,
gcc_diag_flag_specs, gcc_diag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_tdiag", gcc_tdiag_length_specs, gcc_tdiag_char_table, "q+#", NULL,
gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_cdiag", gcc_cdiag_length_specs, gcc_cdiag_char_table, "q+#", NULL,
gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_cxxdiag", gcc_cxxdiag_length_specs, gcc_cxxdiag_char_table, "q+#", NULL,
gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_gfc", gcc_gfc_length_specs, gcc_gfc_char_table, "q+#", NULL,
gcc_gfc_flag_specs, gcc_gfc_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "NSString", NULL, NULL, NULL, NULL,
NULL, NULL,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_PARSE_ARG_CONVERT_EXTERNAL, 0, 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_scanf",scanf_length_specs, scan_char_table, "*'I", NULL,
scanf_flag_specs, scanf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
'w', 0, 0, '*', 'L', 'm',
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_strftime", NULL, time_char_table, "_-0^#", "EO",
strftime_flag_specs, strftime_flag_pairs,
FMT_FLAG_FANCY_PERCENT_OK|FMT_FLAG_M_OK, 'w', 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_strfmon", strfmon_length_specs, monetary_char_table, "=^+(!-", NULL,
strfmon_flag_specs, strfmon_flag_pairs,
FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_syslog", printf_length_specs, print_char_table, " +#0-'I", NULL,
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK|FMT_FLAG_M_OK,
'w', 0, 'p', 0, 'L', 0,
-_type_node, _type_node
+_type_node, _type_node, printf_format_type
},
};
@@ -1098,19 +1098,25 @@ check_function_format (tree attrs, int n
params = tree_cons (NULL_TREE, argarray[i], params);
check_format_info (, params);
}
+ const format_kind_info *fi = _types[info.format_type];
if (warn_suggest_attribute_format && info.first_arg_num == 0
- && (format_types[info.format_type].flags
- & (int) FMT_FLAG_ARG_CONVERT))
+ && (fi->flags & (int) FMT_FLAG_ARG_CONVERT))
{
tree c;
for (c = TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl));
c;
c = TREE_CHAIN (c))
- if (is_attribute_p ("format", TREE_PURPOSE (c))
- && (decode_format_type (IDENTIFIER_POINTER
- (TREE_VALUE
CVS commit: src/external/gpl3/gcc/dist/gcc/c-family
Module Name:src Committed By: christos Date: Fri Sep 14 20:47:32 UTC 2018 Modified Files: src/external/gpl3/gcc/dist/gcc/c-family: c-format.c c-format.h Log Message: The syslog format attribute is a superset of the printf format attribute so allow functions marked with the printf format attribute to call syslog without producing warnings with -Wmissing-format-attribute. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/c-family/c-format.c cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/c-family/c-format.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc.old/dist/gcc/c-family
Module Name:src
Committed By: christos
Date: Fri Sep 14 20:46:46 UTC 2018
Modified Files:
src/external/gpl3/gcc.old/dist/gcc/c-family: c-format.c c-format.h
Log Message:
The syslog format attribute is a superset of the printf format attribute
so allow functions marked with the printf format attribute to call syslog
without producing warnings with -Wmissing-format-attribute.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c \
src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c
diff -u src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c:1.5 src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c:1.6
--- src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c:1.5 Wed Aug 1 20:02:49 2018
+++ src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c Fri Sep 14 16:46:46 2018
@@ -887,70 +887,70 @@ static const format_kind_info format_typ
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L', 0,
-_type_node, _type_node
+_type_node, _type_node, format_type_error
},
{ "asm_fprintf", asm_fprintf_length_specs, asm_fprintf_char_table, " +#0-", NULL,
asm_fprintf_flag_specs, asm_fprintf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L', 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gcc_diag", gcc_diag_length_specs, gcc_diag_char_table, "q+#", NULL,
gcc_diag_flag_specs, gcc_diag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_tdiag", gcc_tdiag_length_specs, gcc_tdiag_char_table, "q+#", NULL,
gcc_tdiag_flag_specs, gcc_tdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_cdiag", gcc_cdiag_length_specs, gcc_cdiag_char_table, "q+#", NULL,
gcc_cdiag_flag_specs, gcc_cdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_cxxdiag", gcc_cxxdiag_length_specs, gcc_cxxdiag_char_table, "q+#", NULL,
gcc_cxxdiag_flag_specs, gcc_cxxdiag_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 'p', 0, 'L', 0,
-NULL, _type_node
+NULL, _type_node, format_type_error
},
{ "gcc_gfc", gcc_gfc_length_specs, gcc_gfc_char_table, "q+#", NULL,
gcc_gfc_flag_specs, gcc_gfc_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_M_OK,
0, 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "NSString", NULL, NULL, NULL, NULL,
NULL, NULL,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_PARSE_ARG_CONVERT_EXTERNAL, 0, 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_scanf",scanf_length_specs, scan_char_table, "*'I", NULL,
scanf_flag_specs, scanf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
'w', 0, 0, '*', 'L', 'm',
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_strftime", NULL, time_char_table, "_-0^#", "EO",
strftime_flag_specs, strftime_flag_pairs,
FMT_FLAG_FANCY_PERCENT_OK|FMT_FLAG_M_OK, 'w', 0, 0, 0, 0, 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_strfmon", strfmon_length_specs, monetary_char_table, "=^+(!-", NULL,
strfmon_flag_specs, strfmon_flag_pairs,
FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
-NULL, NULL
+NULL, NULL, format_type_error
},
{ "gnu_syslog", printf_length_specs, print_char_table, " +#0-'I", NULL,
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK|FMT_FLAG_M_OK,
'w', 0, 'p', 0, 'L', 0,
-_type_node, _type_node
+_type_node, _type_node, printf_format_type
},
};
@@ -1098,19 +1098,25 @@ check_function_format (tree attrs, int n
params = tree_cons (NULL_TREE, argarray[i], params);
check_format_info (, params);
}
+ const format_kind_info *fi = _types[info.format_type];
if (warn_suggest_attribute_format && info.first_arg_num == 0
- && (format_types[info.format_type].flags
- & (int) FMT_FLAG_ARG_CONVERT))
+ && (fi->flags & (int) FMT_FLAG_ARG_CONVERT))
{
tree c;
for (c = TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl));
c;
c = TREE_CHAIN (c))
- if (is_attribute_p ("format", TREE_PURPOSE (c))
- && (decode_format_type (IDENTIFIER_POINTER
-
CVS commit: src/external/gpl3/gcc.old/dist/gcc/c-family
Module Name:src Committed By: christos Date: Fri Sep 14 20:46:46 UTC 2018 Modified Files: src/external/gpl3/gcc.old/dist/gcc/c-family: c-format.c c-format.h Log Message: The syslog format attribute is a superset of the printf format attribute so allow functions marked with the printf format attribute to call syslog without producing warnings with -Wmissing-format-attribute. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.c \ src/external/gpl3/gcc.old/dist/gcc/c-family/c-format.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/man3
Module Name:src Committed By: joerg Date: Fri Sep 14 20:38:38 UTC 2018 Modified Files: src/share/man/man3: attribute.3 Log Message: __dead functions can not return, which is different from not returning a value. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man3/attribute.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: joerg Date: Fri Sep 14 20:38:38 UTC 2018 Modified Files: src/share/man/man3: attribute.3 Log Message: __dead functions can not return, which is different from not returning a value. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man3/attribute.3 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/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.16 src/share/man/man3/attribute.3:1.17 --- src/share/man/man3/attribute.3:1.16 Mon Apr 21 15:52:27 2014 +++ src/share/man/man3/attribute.3 Fri Sep 14 20:38:38 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: attribute.3,v 1.16 2014/04/21 15:52:27 riastradh Exp $ +.\" $NetBSD: attribute.3,v 1.17 2018/09/14 20:38:38 joerg Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -99,10 +99,11 @@ Certain functions, such as .Xr abort 3 and .Xr exit 3 , -can never return any value. +can never return. When such a function is declared with .Ic __dead , -certain optimizations are possible. +certain optimizations are possible and warnings sensitive to the code flow graph +may be pruned. Obviously a .Ic __dead function can never have return type other than
CVS commit: src/tests/usr.bin/printf
Module Name:src
Committed By: kre
Date: Fri Sep 14 19:57:57 UTC 2018
Modified Files:
src/tests/usr.bin/printf: printf.sh
Log Message:
Move the tests of character value args to floating conversions
out of the %e test and into the NetBSD specific tests, while POSIX
once (apparently) required (or seemed to require) support for that,
it no longer does (and character value args to float conversions do
not make much sense - char valuse are always integers).
When char conversions are supported, test that \' (or \" ) (that is,
no character following the quote) works as an arg (should result in zero,
as there's a \0 in the arg after the quote char).
Add some big/small number %g conversion tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/printf/printf.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/usr.bin/printf/printf.sh
diff -u src/tests/usr.bin/printf/printf.sh:1.2 src/tests/usr.bin/printf/printf.sh:1.3
--- src/tests/usr.bin/printf/printf.sh:1.2 Mon Sep 10 15:02:11 2018
+++ src/tests/usr.bin/printf/printf.sh Fri Sep 14 19:57:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: printf.sh,v 1.2 2018/09/10 15:02:11 kre Exp $
+# $NetBSD: printf.sh,v 1.3 2018/09/14 19:57:57 kre Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -408,6 +408,7 @@ d_decimal()
expect 49 '%d' "'1"
expect 45 '%d' "'-1"
expect 43 '%d' "'+1"
+ expect 00 '%.2d' "'"
expect 68 '%d' '"D'
expect 069 '%03d' '"E'
@@ -476,6 +477,8 @@ i_decimal()
expect '02 ' '%-4.2i' 2
expect ' +02' '%+ 4.2i' 2
+ expect 0 '%i' '"'
+
expect_fail '0' %i x22
expect_fail '123' %i 123Mb
expect_fail '15' %i 0xfooD
@@ -996,12 +999,6 @@ e_floats()
expect2 ' nan' 'nan(*)' %5e nan
expect2 'nan ' 'nan(*)' %-5e NAN
- expect 6.50e+01 '%e' "'A"
- expect 6.5e+01 '%.1e' "'A"
- expect 5e+01 '%.0e' "'1"
- expect 4.50e+01 '%.2e' "'-1"
- expect 4.300e+01 '%.3e' "'+1"
-
expect_fail 0.00e+00 '%e' NOT-E
expect_fail 1.20e+00 '%e' 1.2Gb
@@ -1085,6 +1082,16 @@ g_floats()
expect 4.4?e+03 %.3g # p = 3, x = 3 : %.2e
expect 1.2e-05 %.2g 0.12 # p = 2, x = -5: $.1e
+ expect 1e+10 %g 100
+ expect 1e+10 %g 1e10
+ expect 1e+10 %g 1e+10
+ expect 1e-10 %g 1e-10
+ expect 100 %.11g 100
+ expect 100. %#.11g 100
+ expect 1e+99 %g 1e99
+ expect 1e+100 %g 1e100
+ expect 1e-100 %g 1e-100
+
expect2 inf infinity %g Infinity
expect2 -inf -infinity %g -INF
expect2 nan 'nan(*)' %g NaN
@@ -1549,6 +1556,14 @@ NetBSD_extensions()
# verify float support, so don't bother...
fi
+ expect 6.50e+01 '%e' "'A"
+ expect 6.5e+01 '%.1e' "'A"
+ expect 5e+01 '%.0e' "'1"
+ expect 4.50e+01 '%.2e' "'-1"
+ expect 4.300e+01 '%.3e' "'+1"
+ expect 99.00 '%f' '"c"
+ expect 97 '%g' '"a"
+
# NetBSD (non-POSIX) format excape extensions
expect '' '\e'
expect '' '\E'
@@ -1750,7 +1765,7 @@ else
Failures=0
STDERR=$(mktemp ${TMPDIR:-/tmp}/Test-XX)
- trap 'rm -f "${STDERR}"' EXIT
+ trap "rm -f '${STDERR}'" EXIT
exec 3>"${STDERR}"
case "$#" in
CVS commit: src/tests/usr.bin/printf
Module Name:src Committed By: kre Date: Fri Sep 14 19:57:57 UTC 2018 Modified Files: src/tests/usr.bin/printf: printf.sh Log Message: Move the tests of character value args to floating conversions out of the %e test and into the NetBSD specific tests, while POSIX once (apparently) required (or seemed to require) support for that, it no longer does (and character value args to float conversions do not make much sense - char valuse are always integers). When char conversions are supported, test that \' (or \" ) (that is, no character following the quote) works as an arg (should result in zero, as there's a \0 in the arg after the quote char). Add some big/small number %g conversion tests. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/printf/printf.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/printf
Module Name:src
Committed By: kre
Date: Fri Sep 14 19:52:23 UTC 2018
Modified Files:
src/tests/usr.bin/printf: t_builtin.sh
Log Message:
When the shell being tested for builtin printf supports "type -t"
use it to test if printf is built in, it is must more reliable that
guessing at the output format and message of "type" (without -t).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/printf/t_builtin.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/usr.bin/printf/t_builtin.sh
diff -u src/tests/usr.bin/printf/t_builtin.sh:1.3 src/tests/usr.bin/printf/t_builtin.sh:1.4
--- src/tests/usr.bin/printf/t_builtin.sh:1.3 Mon Sep 10 15:02:11 2018
+++ src/tests/usr.bin/printf/t_builtin.sh Fri Sep 14 19:52:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_builtin.sh,v 1.3 2018/09/10 15:02:11 kre Exp $
+# $NetBSD: t_builtin.sh,v 1.4 2018/09/14 19:52:23 kre Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -98,19 +98,24 @@ Not_builtin()
setup()
{
- case "$(unset LANG LC_ALL LC_NUMERIC LC_CTYPE LC_MESSAGES
- ${TEST_SH} -c 'type printf' 2>&1 )" in
-
- ( *[Bb]uiltin* | *[Bb]uilt[-\ ][Ii]n* )
- # nothing here, it all happens below.
- ;;
+ # If the shell being used for its printf supports "type -t", use it
+ if B=$( ${TEST_SH} -c 'type -t printf' 2>/dev/null )
+ then
+ case "$B" in
+ ( builtin ) return 0;;
+ esac
+ else
+ # We get here if type -t is not supported, or it is,
+ # but printf is completely unknown. No harm trying again.
- (*) Tests=
- define Not_builtin 'Dummy test to skip when no printf builtin'
- return 1
- ;;
- esac
+ case "$( unset LANG LC_ALL LC_NUMERIC LC_CTYPE LC_MESSAGES
+ ${TEST_SH} -c 'type printf' 2>&1 )" in
+ ( *[Bb]uiltin* | *[Bb]uilt[-\ ][Ii]n* ) return 0;;
+ esac
+ fi
+ Tests=
+ define Not_builtin 'Dummy test to skip when no printf builtin'
return 0
}
CVS commit: src/tests/usr.bin/printf
Module Name:src Committed By: kre Date: Fri Sep 14 19:52:23 UTC 2018 Modified Files: src/tests/usr.bin/printf: t_builtin.sh Log Message: When the shell being tested for builtin printf supports "type -t" use it to test if printf is built in, it is must more reliable that guessing at the output format and message of "type" (without -t). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/printf/t_builtin.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/pci
On Fri, Sep 14, 2018 at 06:46:47PM +, Jonathan A. Kollasch wrote: > Module Name: src > Committed By: jakllsch > Date: Fri Sep 14 18:46:47 UTC 2018 > > Modified Files: > src/sys/dev/pci: if_msk.c if_mskvar.h if_skreg.h > > Log Message: > msk(4): add 64-bit DMA support > > > To generate a diff of this commit: > cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_msk.c > cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_mskvar.h > cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_skreg.h The commit message on these file-revisions have been adjusted to: msk(4): add 64-bit DMA support portions of this change set provided by mrg@
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: christos
Date: Fri Sep 14 19:06:53 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_fuid.c
Log Message:
The macros kidmap_getsidby{u,g}id always return 1 from sid.h on NetBSD,
and clang is complaining about the impossible... So initialize rid and
be done with it, it is the least intrusive fix.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: christos
Date: Fri Sep 14 19:06:53 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_fuid.c
Log Message:
The macros kidmap_getsidby{u,g}id always return 1 from sid.h on NetBSD,
and clang is complaining about the impossible... So initialize rid and
be done with it, it is the least intrusive fix.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.5 Sat Aug 18 07:59:25 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c Fri Sep 14 15:06:53 2018
@@ -558,7 +558,7 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64
const char *domain;
char *kdomain;
uint32_t fuid_idx = FUID_INDEX(id);
- uint32_t rid;
+ uint32_t rid = UID_NOBODY; // XXX: broken clang
idmap_stat status;
uint64_t idx = 0;
zfs_fuid_t *zfuid = NULL;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Fri Sep 14 18:46:47 UTC 2018
Modified Files:
src/sys/dev/pci: if_msk.c if_mskvar.h if_skreg.h
Log Message:
msk(4): add 64-bit DMA support
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_mskvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_skreg.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/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.77 src/sys/dev/pci/if_msk.c:1.78
--- src/sys/dev/pci/if_msk.c:1.77 Wed Sep 12 13:52:36 2018
+++ src/sys/dev/pci/if_msk.c Fri Sep 14 18:46:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.77 2018/09/12 13:52:36 jakllsch Exp $ */
+/* $NetBSD: if_msk.c,v 1.78 2018/09/14 18:46:47 jakllsch Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.77 2018/09/12 13:52:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.78 2018/09/14 18:46:47 jakllsch Exp $");
#include
#include
@@ -150,6 +150,9 @@ void msk_dump_bytes(const char *, int);
static int msk_sysctl_handler(SYSCTLFN_PROTO);
static int msk_root_num;
+#define MSK_ADDR_LO(x) ((uint64_t) (x) & 0xUL)
+#define MSK_ADDR_HI(x) ((uint64_t) (x) >> 32)
+
/* supported device vendors */
static const struct msk_product {
pci_vendor_id_t msk_vendor;
@@ -409,6 +412,7 @@ msk_init_rx_ring(struct sk_if_softc *sc_
{
struct msk_chain_data *cd = _if->sk_cdata;
struct msk_ring_data *rd = sc_if->sk_rdata;
+ struct msk_rx_desc *r;
int i, nexti;
memset(rd->sk_rx_ring, 0, sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
@@ -426,6 +430,18 @@ msk_init_rx_ring(struct sk_if_softc *sc_
sc_if->sk_cdata.sk_rx_cons = 0;
sc_if->sk_cdata.sk_rx_cnt = 0;
+ /* Mark the first ring element to initialize the high address. */
+ sc_if->sk_cdata.sk_rx_hiaddr = 0;
+ r = >sk_rx_ring[cd->sk_rx_prod];
+ r->sk_addr = htole32(cd->sk_rx_hiaddr);
+ r->sk_len = 0;
+ r->sk_ctl = 0;
+ r->sk_opcode = SK_Y2_BMUOPC_ADDR64 | SK_Y2_RXOPC_OWN;
+ MSK_CDRXSYNC(sc_if, cd->sk_rx_prod,
+ BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+ SK_INC(sc_if->sk_cdata.sk_rx_prod, MSK_RX_RING_CNT);
+ sc_if->sk_cdata.sk_rx_cnt++;
+
msk_fill_rx_ring(sc_if);
return (0);
}
@@ -436,6 +452,7 @@ msk_init_tx_ring(struct sk_if_softc *sc_
struct sk_softc *sc = sc_if->sk_softc;
struct msk_chain_data *cd = _if->sk_cdata;
struct msk_ring_data *rd = sc_if->sk_rdata;
+ struct msk_tx_desc *t;
bus_dmamap_t dmamap;
struct sk_txmap_entry *entry;
int i, nexti;
@@ -468,8 +485,17 @@ msk_init_tx_ring(struct sk_if_softc *sc_
sc_if->sk_cdata.sk_tx_cons = 0;
sc_if->sk_cdata.sk_tx_cnt = 0;
+ /* Mark the first ring element to initialize the high address. */
+ sc_if->sk_cdata.sk_tx_hiaddr = 0;
+ t = >sk_tx_ring[cd->sk_tx_prod];
+ t->sk_addr = htole32(cd->sk_tx_hiaddr);
+ t->sk_len = 0;
+ t->sk_ctl = 0;
+ t->sk_opcode = SK_Y2_BMUOPC_ADDR64 | SK_Y2_TXOPC_OWN;
MSK_CDTXSYNC(sc_if, 0, MSK_TX_RING_CNT,
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ SK_INC(sc_if->sk_cdata.sk_tx_prod, MSK_TX_RING_CNT);
+ sc_if->sk_cdata.sk_tx_cnt++;
return (0);
}
@@ -480,7 +506,8 @@ msk_newbuf(struct sk_if_softc *sc_if, bu
struct mbuf *m_new = NULL;
struct sk_chain *c;
struct msk_rx_desc *r;
- void *buf = NULL;
+ void *buf = NULL;
+ bus_addr_t addr;
MGETHDR(m_new, M_DONTWAIT, MT_DATA);
if (m_new == NULL)
@@ -501,12 +528,34 @@ msk_newbuf(struct sk_if_softc *sc_if, bu
m_adj(m_new, ETHER_ALIGN);
+ addr = dmamap->dm_segs[0].ds_addr +
+ ((vaddr_t)m_new->m_data -
+ (vaddr_t)sc_if->sk_cdata.sk_jumbo_buf);
+
+ if (sc_if->sk_cdata.sk_rx_hiaddr != MSK_ADDR_HI(addr)) {
+ c = _if->sk_cdata.sk_rx_chain[sc_if->sk_cdata.sk_rx_prod];
+ r = c->sk_le;
+ c->sk_mbuf = NULL;
+ r->sk_addr = htole32(MSK_ADDR_HI(addr));
+ r->sk_len = 0;
+ r->sk_ctl = 0;
+ r->sk_opcode = SK_Y2_BMUOPC_ADDR64 | SK_Y2_RXOPC_OWN;
+ sc_if->sk_cdata.sk_rx_hiaddr = MSK_ADDR_HI(addr);
+
+ MSK_CDRXSYNC(sc_if, sc_if->sk_cdata.sk_rx_prod,
+ BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+
+ SK_INC(sc_if->sk_cdata.sk_rx_prod, MSK_RX_RING_CNT);
+ sc_if->sk_cdata.sk_rx_cnt++;
+
+ DPRINTFN(10, ("%s: rx ADDR64: %#x\n",
+ sc_if->sk_ethercom.ec_if.if_xname, (unsigned)MSK_ADDR_HI(addr)));
+ }
+
c = _if->sk_cdata.sk_rx_chain[sc_if->sk_cdata.sk_rx_prod];
r = c->sk_le;
c->sk_mbuf = m_new;
- r->sk_addr = htole32(dmamap->dm_segs[0].ds_addr +
- (((vaddr_t)m_new->m_data
- - (vaddr_t)sc_if->sk_cdata.sk_jumbo_buf)));
+ r->sk_addr = htole32(MSK_ADDR_LO(addr));
r->sk_len = htole16(SK_JLEN);
r->sk_ctl = 0;
r->sk_opcode = SK_Y2_RXOPC_PACKET | SK_Y2_RXOPC_OWN;
@@ -702,7 +751,7 @@ msk_ioctl(struct ifnet *ifp, u_long cmd,
s = splnet();
- DPRINTFN(2, ("msk_ioctl ETHER\n"));
+ DPRINTFN(2, ("msk_ioctl
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Fri Sep 14 18:46:47 UTC 2018 Modified Files: src/sys/dev/pci: if_msk.c if_mskvar.h if_skreg.h Log Message: msk(4): add 64-bit DMA support To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_msk.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_mskvar.h cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_skreg.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/aarch64/aarch64
Module Name:src
Committed By: ryo
Date: Fri Sep 14 13:47:14 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: copyinout.S trap.c
Log Message:
change copystr() to asm so that we don't have to add __noasan.
Also copyinout.S is the right place for copystr().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/copyinout.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/aarch64/aarch64/trap.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/aarch64/aarch64/copyinout.S
diff -u src/sys/arch/aarch64/aarch64/copyinout.S:1.8 src/sys/arch/aarch64/aarch64/copyinout.S:1.9
--- src/sys/arch/aarch64/aarch64/copyinout.S:1.8 Mon Sep 10 17:25:15 2018
+++ src/sys/arch/aarch64/aarch64/copyinout.S Fri Sep 14 13:47:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: copyinout.S,v 1.8 2018/09/10 17:25:15 ryo Exp $ */
+/* $NetBSD: copyinout.S,v 1.9 2018/09/14 13:47:14 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: copyinout.S,v 1.8 2018/09/10 17:25:15 ryo Exp $");
+RCSID("$NetBSD: copyinout.S,v 1.9 2018/09/14 13:47:14 ryo Exp $");
.macro enter_cpu_onfault
stp fp, lr, [sp, #-16]! /* save fp, lr */
@@ -314,6 +314,34 @@ copyoutstr_done:
END(copyoutstr)
+/* LINTSTUB: int copystr(const void *s, void *d, size_t len, size_t *done); */
+
+ENTRY(copystr)
+ enter_cpu_onfault
+
+ mov x8, #0 /* error = 0 */
+
+ mov x4, xzr /* i = 0 */
+ cbz x2, copystr_done /* if (len == 0) goto done */
+copystr_loop:
+ ldrb w5, [x0], #1 /* ch = src[i] */
+ strb w5, [x1], #1 /* dst[i] = ch */
+ add x4, x4, #1 /* i++ */
+ cbz x5, copystr_done /* if (ch == '\0') goto done */
+
+ cmp x4, x2 /* if (i < len) goto loop */
+ bcc copystr_loop
+ mov x8, #ENAMETOOLONG /* error = ENAMETOOLONG */
+
+copystr_done:
+ cbz x3, 1f /* if (done != NULL) *done = i */
+ str x4, [x3]
+1:
+ exit_cpu_onfault
+ ret
+END(copystr)
+
+
/* LINTSTUB: int kcopy(const void *src, void *dst, size_t len); */
ENTRY(kcopy)
Index: src/sys/arch/aarch64/aarch64/trap.c
diff -u src/sys/arch/aarch64/aarch64/trap.c:1.9 src/sys/arch/aarch64/aarch64/trap.c:1.10
--- src/sys/arch/aarch64/aarch64/trap.c:1.9 Mon Sep 10 17:25:15 2018
+++ src/sys/arch/aarch64/aarch64/trap.c Fri Sep 14 13:47:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.9 2018/09/10 17:25:15 ryo Exp $ */
+/* $NetBSD: trap.c,v 1.10 2018/09/14 13:47:14 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.9 2018/09/10 17:25:15 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.10 2018/09/14 13:47:14 ryo Exp $");
#include "opt_arm_intr_impl.h"
#include "opt_compat_netbsd32.h"
@@ -420,32 +420,6 @@ ucas_ras_check(struct trapframe *tf)
#endif
}
-int
-copystr(const void *kfaddr, void *kdaddr, size_t len, size_t *done)
-{
- struct faultbuf fb;
- size_t i;
- int error;
- const char *src = kfaddr;
- char *dst = kdaddr;
-
- if ((error = cpu_set_onfault()) == 0) {
- for (i = 0; i < len; i++) {
- if ((*dst++ = *src++) == '\0') {
-i++;
-error = 0;
-goto done;
- }
- }
- error = ENAMETOOLONG;
- done:
- if (done != NULL)
- *done = i;
- cpu_unset_onfault();
- }
- return error;
-}
-
#ifdef TRAP_SIGDEBUG
static void
frame_dump(const struct trapframe *tf)
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: ryo Date: Fri Sep 14 13:47:14 UTC 2018 Modified Files: src/sys/arch/aarch64/aarch64: copyinout.S trap.c Log Message: change copystr() to asm so that we don't have to add __noasan. Also copyinout.S is the right place for copystr(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/copyinout.S cvs rdiff -u -r1.9 -r1.10 src/sys/arch/aarch64/aarch64/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: rin Date: Fri Sep 14 13:19:15 UTC 2018 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Fix description for -r option reflecting the actual behavior. Suggested by christos on current-users. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nvi/dist/docs/vi.man/vi.1 diff -u src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.6 src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 --- src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.6 Tue Aug 7 08:05:47 2018 +++ src/external/bsd/nvi/dist/docs/vi.man/vi.1 Fri Sep 14 13:19:15 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: vi.1,v 1.6 2018/08/07 08:05:47 rin Exp $ +.\" $NetBSD: vi.1,v 1.7 2018/09/14 13:19:15 rin Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -12,7 +12,7 @@ .\" .\" Id: vi.1,v 8.53 2001/01/28 13:20:06 skimo Exp (Berkeley) Date: 2001/01/28 13:20:06 .\" -.TH VI 1 "August 7, 2018" +.TH VI 1 "September 14, 2018" .UC .SH NAME ex, vi, view \- text editors @@ -136,10 +136,6 @@ option was set. .B \-r Recover the specified files, or, if no files are specified, list the files that could be recovered. -If no recoverable files by the specified name exist, -the file is edited as if the -.B \-r -option had not been specified. .TP .B \-S Run with the
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: rin Date: Fri Sep 14 13:19:15 UTC 2018 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Fix description for -r option reflecting the actual behavior. Suggested by christos on current-users. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/samsung
Module Name:src
Committed By: skrll
Date: Fri Sep 14 11:58:38 UTC 2018
Modified Files:
src/sys/arch/arm/samsung: exynos_platform.c exynos_soc.c exynos_var.h
Log Message:
exynos_bootstrap doesn't need an argument
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/samsung/exynos_soc.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/samsung/exynos_var.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/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.15 src/sys/arch/arm/samsung/exynos_platform.c:1.16
--- src/sys/arch/arm/samsung/exynos_platform.c:1.15 Tue Sep 11 10:06:53 2018
+++ src/sys/arch/arm/samsung/exynos_platform.c Fri Sep 14 11:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.15 2018/09/11 10:06:53 jmcneill Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -34,7 +34,7 @@
#include "ukbd.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.15 2018/09/11 10:06:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $");
#include
#include
@@ -123,7 +123,7 @@ static void
exynos_platform_bootstrap(void)
{
- exynos_bootstrap(EXYNOS_CORE_VBASE);
+ exynos_bootstrap();
void (*mp_bootstrap)(void) = NULL;
const struct of_compat_data *cd = of_search_compatible(OF_finddevice("/"), mp_compat_data);
Index: src/sys/arch/arm/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.35 src/sys/arch/arm/samsung/exynos_soc.c:1.36
--- src/sys/arch/arm/samsung/exynos_soc.c:1.35 Sun Aug 19 07:27:33 2018
+++ src/sys/arch/arm/samsung/exynos_soc.c Fri Sep 14 11:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.35 2018/08/19 07:27:33 skrll Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.36 2018/09/14 11:58:38 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "opt_exynos.h"
#include
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.35 2018/08/19 07:27:33 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.36 2018/09/14 11:58:38 skrll Exp $");
#include
#include
@@ -475,7 +475,7 @@ exynos_clocks_bootstrap(void)
void
-exynos_bootstrap(vaddr_t iobase)
+exynos_bootstrap(void)
{
int error;
size_t core_size, audiocore_size;
@@ -485,6 +485,7 @@ exynos_bootstrap(vaddr_t iobase)
bus_addr_t exynos_pmu_offset;
bus_addr_t exynos_sysreg_offset;
bus_addr_t exynos_cmu_apll_offset;
+ const vaddr_t iobase = EXYNOS_CORE_VBASE;
#ifdef SOC_EXYNOS4
core_size = EXYNOS4_CORE_SIZE;
Index: src/sys/arch/arm/samsung/exynos_var.h
diff -u src/sys/arch/arm/samsung/exynos_var.h:1.25 src/sys/arch/arm/samsung/exynos_var.h:1.26
--- src/sys/arch/arm/samsung/exynos_var.h:1.25 Sun Aug 19 07:27:33 2018
+++ src/sys/arch/arm/samsung/exynos_var.h Fri Sep 14 11:58:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_var.h,v 1.25 2018/08/19 07:27:33 skrll Exp $ */
+/* $NetBSD: exynos_var.h,v 1.26 2018/09/14 11:58:38 skrll Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@ extern bus_space_handle_t exynos_pmu_bsh
extern bus_space_handle_t exynos_cmu_bsh;
extern bus_space_handle_t exynos_sysreg_bsh;
-extern void exynos_bootstrap(vaddr_t);
+extern void exynos_bootstrap(void);
extern void exynos_dma_bootstrap(psize_t memsize);
struct exynos_pinctrl_softc;
CVS commit: src/sys/arch/arm/samsung
Module Name:src Committed By: skrll Date: Fri Sep 14 11:58:38 UTC 2018 Modified Files: src/sys/arch/arm/samsung: exynos_platform.c exynos_soc.c exynos_var.h Log Message: exynos_bootstrap doesn't need an argument To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/samsung/exynos_soc.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/samsung/exynos_var.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/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Sep 14 11:30:07 UTC 2018 Removed Files: src/sys/arch/evbarm/conf: GOLDENGATE_INSTALL Log Message: Some tweet told me I missed this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/GOLDENGATE_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Sep 14 11:30:07 UTC 2018 Removed Files: src/sys/arch/evbarm/conf: GOLDENGATE_INSTALL Log Message: Some tweet told me I missed this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/GOLDENGATE_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Fri Sep 14 11:05:09 UTC 2018 Modified Files: src/sys/net: if_bridge.c Log Message: Fix a bug that bridge_enqueue() incorrectly cleared outgoing packet's offload flags. bridge_enqueue() is called from bridge_output() when a packet is spontaneous. Clear csum_flags before calling brige_enqueue() in bridge_forward() or bridge_broadcast() instead of in the beginning of bridge_enqueue(). Note that this change doesn't fix a problem on the following configuration: A bridge has two or more interfaces. An address is assigned to an bridge member interface and some offload flags are set. Another interface has no address and has no any offload flag. XXX pullup-[78] To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Fri Sep 14 11:05:09 UTC 2018
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Fix a bug that bridge_enqueue() incorrectly cleared outgoing packet's offload
flags. bridge_enqueue() is called from bridge_output() when a packet is
spontaneous. Clear csum_flags before calling brige_enqueue() in
bridge_forward() or bridge_broadcast() instead of in the beginning of
bridge_enqueue().
Note that this change doesn't fix a problem on the following configuration:
A bridge has two or more interfaces.
An address is assigned to an bridge member interface and
some offload flags are set.
Another interface has no address and has no any offload flag.
XXX pullup-[78]
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.156 src/sys/net/if_bridge.c:1.157
--- src/sys/net/if_bridge.c:1.156 Fri May 25 04:40:27 2018
+++ src/sys/net/if_bridge.c Fri Sep 14 11:05:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.156 2018/05/25 04:40:27 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.157 2018/09/14 11:05:09 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.156 2018/05/25 04:40:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.157 2018/09/14 11:05:09 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1395,11 +1395,6 @@ bridge_enqueue(struct bridge_softc *sc,
int len, error;
short mflags;
- /*
- * Clear any in-bound checksum flags for this packet.
- */
- m->m_pkthdr.csum_flags = 0;
-
if (runfilt) {
if (pfil_run_hooks(sc->sc_if.if_pfil, ,
dst_ifp, PFIL_OUT) != 0) {
@@ -1768,6 +1763,11 @@ bridge_forward(struct bridge_softc *sc,
bridge_release_member(sc, bif, );
+ /*
+ * Clear any in-bound checksum flags for this packet.
+ */
+ m->m_pkthdr.csum_flags = 0;
+
ACQUIRE_GLOBAL_LOCKS();
bridge_enqueue(sc, dst_if, m, 1);
RELEASE_GLOBAL_LOCKS();
@@ -1978,6 +1978,12 @@ bridge_broadcast(struct bridge_softc *sc
sc->sc_if.if_oerrors++;
goto next;
}
+
+ /*
+ * Clear any in-bound checksum flags for this packet.
+ */
+ m->m_pkthdr.csum_flags = 0;
+
ACQUIRE_GLOBAL_LOCKS();
bridge_enqueue(sc, dst_if, mc, 1);
RELEASE_GLOBAL_LOCKS();
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 10:41:48 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.12 -r1.13.2.13 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.12 -r1.24.2.13 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Fri Sep 14 10:41:47 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Fri Sep 14 10:41:47 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.14
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Fri Sep 14 10:41:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.13
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Fri Sep 14 10:41:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -42,6 +42,7 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \ src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.13.2.12 -r1.13.2.13 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.24.2.12 -r1.24.2.13 \ src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 10:41:13 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Add MODULAR attribute to sigreturn. I think this is the last one.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.16 -r1.120.2.17 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.16 src/sys/compat/netbsd32/syscalls.master:1.120.2.17
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.16 Fri Sep 14 01:20:52 2018
+++ src/sys/compat/netbsd32/syscalls.master Fri Sep 14 10:41:13 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -259,7 +259,8 @@
102 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||orecv(int s, netbsd32_voidp buf, \
int len, int flags); }
-103 COMPAT_13 { int|netbsd32||sigreturn( \
+103 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|netbsd32||sigreturn( \
netbsd32_sigcontextp_t sigcntxp); } sigreturn13
104 STD { int|netbsd32||bind(int s, netbsd32_sockaddrp_t name, \
int namelen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 10:41:13 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master Log Message: Add MODULAR attribute to sigreturn. I think this is the last one. To generate a diff of this commit: cvs rdiff -u -r1.120.2.16 -r1.120.2.17 \ src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Fri Sep 14 10:13:03 UTC 2018 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: Fix BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE for aarch64. The readonly mbuf optimisation is for the old arm pmap. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32
Module Name:src
Committed By: skrll
Date: Fri Sep 14 10:13:03 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Fix BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE for aarch64.
The readonly mbuf optimisation is for the old arm pmap.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.112 src/sys/arch/arm/arm32/bus_dma.c:1.113
--- src/sys/arch/arm/arm32/bus_dma.c:1.112 Mon Sep 3 16:29:23 2018
+++ src/sys/arch/arm/arm32/bus_dma.c Fri Sep 14 10:13:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.112 2018/09/03 16:29:23 riastradh Exp $ */
+/* $NetBSD: bus_dma.c,v 1.113 2018/09/14 10:13:02 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.112 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.113 2018/09/14 10:13:02 skrll Exp $");
#include
#include
@@ -796,7 +796,7 @@ _bus_dmamap_sync_segment(vaddr_t va, pad
bool readonly_p)
{
-#ifdef ARM_MMU_EXTENDED
+#if defined(ARM_MMU_EXTENDED) || defined(CPU_CORTEX)
/*
* No optimisations are available for readonly mbufs on armv6+, so
* assume it's not readonly from here on.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Fri Sep 14 09:51:09 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
- Fix a bug that Denverton accessed wrong register in
ixgbe_setup_low_power_mode(). The location of some registers in Denverton
were changed. The GRC register is one of them, so use IXGBE_GRC_BY_MAC(hw)
instead of IXGBE_GRC.
- ixgbe_check_wol_support() tests the capability of WOL, but the sysctl
knobs for WOL were added only for IXGBE_DEV_ID_X550EM_X_10G_T. Add the
knobs when adapter->wol_support is not 0.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/pci/ixgbe/ixgbe.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.165 src/sys/dev/pci/ixgbe/ixgbe.c:1.166
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.165 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Sep 14 09:51:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.165 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.166 2018/09/14 09:51:09 msaitoh Exp $ */
/**
@@ -3279,7 +3279,7 @@ ixgbe_add_device_sysctls(struct adapter
aprint_error_dev(dev, "could not create sysctl\n");
/* for WoL-capable devices */
- if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T) {
+ if (adapter->wol_support) {
if (sysctl_createv(log, 0, , , CTLFLAG_READWRITE,
CTLTYPE_BOOL, "wol_enable",
SYSCTL_DESCR("Enable/Disable Wake on LAN"),
@@ -3665,8 +3665,8 @@ ixgbe_setup_low_power_mode(struct adapte
IXGBE_WRITE_REG(hw, IXGBE_WUC, 0);
} else {
/* Turn off support for APM wakeup. (Using ACPI instead) */
- IXGBE_WRITE_REG(hw, IXGBE_GRC,
- IXGBE_READ_REG(hw, IXGBE_GRC) & ~(u32)2);
+ IXGBE_WRITE_REG(hw, IXGBE_GRC_BY_MAC(hw),
+ IXGBE_READ_REG(hw, IXGBE_GRC_BY_MAC(hw)) & ~(u32)2);
/*
* Clear Wake Up Status register to prevent any previous wakeup
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Sep 14 09:51:09 UTC 2018 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: - Fix a bug that Denverton accessed wrong register in ixgbe_setup_low_power_mode(). The location of some registers in Denverton were changed. The GRC register is one of them, so use IXGBE_GRC_BY_MAC(hw) instead of IXGBE_GRC. - ixgbe_check_wol_support() tests the capability of WOL, but the sysctl knobs for WOL were added only for IXGBE_DEV_ID_X550EM_X_10G_T. Add the knobs when adapter->wol_support is not 0. XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 09:21:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: Forward declaration of struct netbsd32_modctl_args To generate a diff of this commit: cvs rdiff -u -r1.116.2.6 -r1.116.2.7 src/sys/compat/netbsd32/netbsd32.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/compat/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 Fri Sep 14 08:53:22 2018 +++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 09:21:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.7 2018/09/14 09:21:33 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1175,6 +1175,7 @@ extern const char * const netbsd32_sysca extern struct sysctlnode netbsd32_sysctl_root; +struct netbsd32_modctl_args; extern int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *);
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 09:21:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: Forward declaration of struct netbsd32_modctl_args To generate a diff of this commit: cvs rdiff -u -r1.116.2.6 -r1.116.2.7 src/sys/compat/netbsd32/netbsd32.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
Module Name:src
Committed By: skrll
Date: Fri Sep 14 09:06:13 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: mk.generic64
Added Files:
src/sys/arch/aarch64/aarch64: start.S
Removed Files:
src/sys/arch/evbarm/fdt: fdt_start.S genassym.cf
Log Message:
Move the aarch64 start stub from sys/arch/evbarm to sys/arch/aarch64.
Delete the unused/empty evbarm/fdt/genassym.cf while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/aarch64/aarch64/start.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/fdt/fdt_start.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/fdt/genassym.cf
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/evbarm/conf/mk.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.1 src/sys/arch/evbarm/conf/mk.generic64:1.2
--- src/sys/arch/evbarm/conf/mk.generic64:1.1 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/evbarm/conf/mk.generic64 Fri Sep 14 09:06:12 2018
@@ -1,7 +1,7 @@
-# $NetBSD: mk.generic64,v 1.1 2018/04/01 04:35:04 ryo Exp $
+# $NetBSD: mk.generic64,v 1.2 2018/09/14 09:06:12 skrll Exp $
-SYSTEM_FIRST_OBJ= fdt_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/fdt/fdt_start.S
+SYSTEM_FIRST_OBJ= start.o
+SYSTEM_FIRST_SFILE= ${ARM}/aarch64/start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
@@ -10,8 +10,6 @@ BOARDTYPE= evbarm64
MKUBOOTIMAGEARGS= -f arm64
MKKNLIMG= ${THISARM}/compile/rpi-mkknlimg.sh
-GENASSYM_EXTRAS+= ${THISARM}/fdt/genassym.cf
-
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
Added files:
Index: src/sys/arch/aarch64/aarch64/start.S
diff -u /dev/null src/sys/arch/aarch64/aarch64/start.S:1.1
--- /dev/null Fri Sep 14 09:06:13 2018
+++ src/sys/arch/aarch64/aarch64/start.S Fri Sep 14 09:06:12 2018
@@ -0,0 +1,80 @@
+/* $NetBSD: start.S,v 1.1 2018/09/14 09:06:12 skrll Exp $ */
+
+/*
+ * Copyright (c) 2017 Ryo Shimizu
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opt_arm_debug.h" /* VERBOSE_INIT_ARM */
+
+#include
+
+#include
+
+RCSID("$NetBSD: start.S,v 1.1 2018/09/14 09:06:12 skrll Exp $")
+
+/* load far effective address (pc relative) */
+.macro ADDR, reg, addr
+ adrp \reg, \addr
+ add \reg, \reg, #:lo12:\addr
+.endm
+
+/*
+ * Kernel start routine for aarch64 boards.
+ */
+ .global start
+start:
+ adr x9, start
+ ldr x10, =start
+
+ sub x10, x10, x9
+
+ /* address of kern_vtopdiff (relative) */
+ ADDR x8, kern_vtopdiff
+ str x10, [x8] /* kern_vtopdiff = start(virt) - start(phys) */
+
+ /*
+ * store uboot arguments to uboot_args[4]
+ */
+
+ /* address of uboot_args (relative) */
+ ADDR x8, uboot_args
+ str x0, [x8, #(8*0)]
+ str x1, [x8, #(8*1)]
+ str x2, [x8, #(8*2)]
+ str x3, [x8, #(8*3)]
+
+ /*
+ * ARM64 boot protocol has FDT address in x0 *
+ */
+ ADDR x8, fdt_addr_r
+ str x0, [x8]
+
+ b aarch64_start /* aarch64_start() @ aarch64/locore.S */
+
+ENTRY_NP(uartputc)
+#ifdef EARLYCONS
+ b ___CONCAT(EARLYCONS, _platform_early_putchar)
+#endif
+ ret
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Fri Sep 14 09:06:13 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: mk.generic64 Added Files: src/sys/arch/aarch64/aarch64: start.S Removed Files: src/sys/arch/evbarm/fdt: fdt_start.S genassym.cf Log Message: Move the aarch64 start stub from sys/arch/evbarm to sys/arch/aarch64. Delete the unused/empty evbarm/fdt/genassym.cf while I'm here. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/aarch64/aarch64/start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.generic64 cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/fdt/fdt_start.S cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/fdt/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 08:53:22 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c netbsd32_netbsd.c Log Message: Move some extern definitions into netbsd32_netbsd.h rather than having them in the .c files. To generate a diff of this commit: cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \ src/sys/compat/netbsd32/netbsd32_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 08:53:22 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c
netbsd32_netbsd.c
Log Message:
Move some extern definitions into netbsd32_netbsd.h rather than having
them in the .c files.
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \
src/sys/compat/netbsd32/netbsd32_netbsd.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/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 src/sys/compat/netbsd32/netbsd32.h:1.116.2.6
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 Fri Sep 14 08:38:37 2018
+++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.5 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1167,6 +1167,17 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_
extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+extern struct sysent netbsd32_sysent[];
+extern const uint32_t netbsd32_sysent_nomodbits[];
+#ifdef SYSCALL_DEBUG
+extern const char * const netbsd32_syscallnames[];
+#endif
+
+extern struct sysctlnode netbsd32_sysctl_root;
+
+extern int (*vec_compat32_80_modctl)(struct lwp *,
+const struct netbsd32_modctl_args *, register_t *);
+
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.6
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_module.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#include
#include
@@ -42,9 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
-extern int (*vec_compat32_80_modctl)(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
-
static int
modctl32_handle_stat(struct netbsd32_iovec *iov, void *arg)
{
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.6
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 Wed Sep 12 01:26:40 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -89,11 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include
#endif
-extern struct sysent netbsd32_sysent[];
-extern const uint32_t netbsd32_sysent_nomodbits[];
-#ifdef SYSCALL_DEBUG
-extern const char * const netbsd32_syscallnames[];
-#endif
#ifdef __HAVE_SYSCALL_INTERN
void netbsd32_syscall_intern(struct proc *);
#else
@@ -102,8 +97,6 @@ void syscall(void);
#define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b))
-extern struct sysctlnode netbsd32_sysctl_root;
-
#ifdef MODULAR
#include
#endif
CVS commit: src/sys/arch/aarch64/conf
Module Name:src
Committed By: skrll
Date: Fri Sep 14 08:51:07 UTC 2018
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
Log Message:
s/A64/ARM/
no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/conf/Makefile.aarch64
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/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.10 src/sys/arch/aarch64/conf/Makefile.aarch64:1.11
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.10 Sat Jun 23 01:51:03 2018
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Fri Sep 14 08:51:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.10 2018/06/23 01:51:03 jakllsch Exp $
+# $NetBSD: Makefile.aarch64,v 1.11 2018/09/14 08:51:06 skrll Exp $
# Makefile for NetBSD
#
@@ -25,8 +25,8 @@ NEED_OWN_INSTALL_TARGET?=no
## (1) port identification
##
THISARM= $S/arch/${MACHINE}
-A64= $S/arch/aarch64
-GENASSYM_CONF= ${A64}/aarch64/genassym.cf
+ARM= $S/arch/aarch64
+GENASSYM_CONF= ${ARM}/aarch64/genassym.cf
.-include "$S/arch/${MACHINE}/conf/Makefile.${MACHINE}.inc"
##
@@ -50,20 +50,20 @@ KERN_AS= obj
##
MD_OBJS+= ${SYSTEM_FIRST_OBJ} locore.o
MD_CFILES+=
-MD_SFILES+= ${SYSTEM_FIRST_SFILE} ${A64}/aarch64/locore.S
+MD_SFILES+= ${SYSTEM_FIRST_SFILE} ${ARM}/aarch64/locore.S
.if defined(SYSTEM_FIRST_OBJ)
${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
${NORMAL_S}
.endif
-locore.o: ${A64}/aarch64/locore.S assym.h
+locore.o: ${ARM}/aarch64/locore.S assym.h
${NORMAL_S}
##
## (5) link settings
##
-KERNLDSCRIPT?= ${A64}/conf/kern.ldscript
+KERNLDSCRIPT?= ${ARM}/conf/kern.ldscript
LOADADDRESS?= 0xffc00040
LINKFLAGS_NORMAL= -X
CVS commit: src/sys/arch/aarch64/conf
Module Name:src Committed By: skrll Date: Fri Sep 14 08:51:07 UTC 2018 Modified Files: src/sys/arch/aarch64/conf: Makefile.aarch64 Log Message: s/A64/ARM/ no functional change To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/conf/Makefile.aarch64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 08:38:37 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
netbsd32_machdep_16.c
src/sys/arch/amd64/conf [pgoyette-compat]: files.amd64
src/sys/arch/xen/conf [pgoyette-compat]: files.xen
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_compat_16.c netbsd32_mod.c
src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile
Log Message:
OMG it builds!
Finish rearranging the amd64 MD compat_netbsd32 code.
XXX Other architectures will be dealt with later.
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.2 -r1.115.2.3 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.101.2.4 -r1.101.2.5 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.165.2.5 -r1.165.2.6 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.116.2.4 -r1.116.2.5 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_16.c
cvs rdiff -u -r1.13.16.10 -r1.13.16.11 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.20.12.11 -r1.20.12.12 \
src/sys/modules/compat_netbsd32/Makefile
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_netbsd32_16/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/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.2 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.3
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.2 Fri Sep 14 05:37:08 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Fri Sep 14 08:38:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.2 2018/09/14 05:37:08 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.3 2018/09/14 08:38:37 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.2 2018/09/14 05:37:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.3 2018/09/14 08:38:37 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -279,66 +279,6 @@ netbsd32_sendsig(const ksiginfo_t *ksi,
(*vec_netbsd32_sendsig)(ksi, mask);
}
-int
-compat_16_netbsd32___sigreturn14(struct lwp *l, const struct compat_16_netbsd32___sigreturn14_args *uap, register_t *retval)
-{
- /* {
- syscallarg(netbsd32_sigcontextp_t) sigcntxp;
- } */
- struct netbsd32_sigcontext *scp, context;
- struct proc *p = l->l_proc;
- struct trapframe *tf;
- int error;
-
- /*
- * The trampoline code hands us the context.
- * It is unsafe to keep track of it ourselves, in the event that a
- * program jumps out of a signal handler.
- */
- scp = NETBSD32PTR64(SCARG(uap, sigcntxp));
- if (copyin(scp, , sizeof(*scp)) != 0)
- return (EFAULT);
-
- /*
- * Check for security violations.
- */
- error = check_sigcontext32(l, );
- if (error != 0)
- return error;
-
- /* Restore register context. */
- tf = l->l_md.md_regs;
- tf->tf_ds = context.sc_ds & 0x;
- tf->tf_es = context.sc_es & 0x;
- cpu_fsgs_reload(l, context.sc_fs, context.sc_gs);
- tf->tf_rflags = context.sc_eflags;
- tf->tf_rdi = context.sc_edi;
- tf->tf_rsi = context.sc_esi;
- tf->tf_rbp = context.sc_ebp;
- tf->tf_rbx = context.sc_ebx;
- tf->tf_rdx = context.sc_edx;
- tf->tf_rcx = context.sc_ecx;
- tf->tf_rax = context.sc_eax;
-
- tf->tf_rip = context.sc_eip;
- tf->tf_cs = context.sc_cs & 0x;
- tf->tf_rsp = context.sc_esp;
- tf->tf_ss = context.sc_ss & 0x;
-
- mutex_enter(p->p_lock);
- /* Restore signal stack. */
- if (context.sc_onstack & SS_ONSTACK)
- l->l_sigstk.ss_flags |= SS_ONSTACK;
- else
- l->l_sigstk.ss_flags &= ~SS_ONSTACK;
- /* Restore signal mask. */
- (void) sigprocmask1(l, SIG_SETMASK, _mask, 0);
- mutex_exit(p->p_lock);
-
- return (EJUSTRETURN);
-}
-
-
#ifdef COREDUMP
/*
* Dump the machine specific segment at the start of a core dump.
@@ -1028,17 +968,14 @@ netbsd32_vm_default_addr(struct proc *p,
int netbsd32_amd64_init(int);
int netbsd32_amd64_fini(int);
-int
-netbsd32_amd64_init(int misc)
+void
+netbsd32_machdep_md_init(void)
{
vec_netbsd32_sendsig = netbsd32_sendsig_siginfo;
- return 0;
}
-int
-netbsd32_amd64_fini(int misc)
+void
+netbsd32_machdep_md_fini(void)
{
-
- return 0;
}
Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.1 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.2
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.1 Fri Sep 14 05:37:08 2018
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Fri Sep 14 08:38:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.1
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Fri Sep 14 08:38:37 UTC 2018 Modified Files: src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c netbsd32_machdep_16.c src/sys/arch/amd64/conf [pgoyette-compat]: files.amd64 src/sys/arch/xen/conf [pgoyette-compat]: files.xen src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_compat_16.c netbsd32_mod.c src/sys/modules/compat_netbsd32 [pgoyette-compat]: Makefile src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile Log Message: OMG it builds! Finish rearranging the amd64 MD compat_netbsd32 code. XXX Other architectures will be dealt with later. To generate a diff of this commit: cvs rdiff -u -r1.115.2.2 -r1.115.2.3 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c cvs rdiff -u -r1.101.2.4 -r1.101.2.5 src/sys/arch/amd64/conf/files.amd64 cvs rdiff -u -r1.165.2.5 -r1.165.2.6 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.116.2.4 -r1.116.2.5 src/sys/compat/netbsd32/netbsd32.h cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_16.c cvs rdiff -u -r1.13.16.10 -r1.13.16.11 src/sys/compat/netbsd32/netbsd32_mod.c cvs rdiff -u -r1.20.12.11 -r1.20.12.12 \ src/sys/modules/compat_netbsd32/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_netbsd32_16/Makefile 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: rin Date: Fri Sep 14 08:11:30 UTC 2018 Modified Files: src/share/man/man4: mpls.4 Log Message: pseudo-device ifmpls was renamed to mpls long ago. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/mpls.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/mpls.4 diff -u src/share/man/man4/mpls.4:1.10 src/share/man/man4/mpls.4:1.11 --- src/share/man/man4/mpls.4:1.10 Mon Jul 3 21:30:58 2017 +++ src/share/man/man4/mpls.4 Fri Sep 14 08:11:30 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: mpls.4,v 1.10 2017/07/03 21:30:58 wiz Exp $ +.\" $NetBSD: mpls.4,v 1.11 2018/09/14 08:11:30 rin Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" 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 July 24, 2013 +.Dd September 14, 2018 .Dt MPLS 4 .Os .Sh NAME @@ -32,7 +32,7 @@ .Nd Multiprotocol Label Switching .Sh SYNOPSIS .Cd options MPLS -.Cd pseudo-device ifmpls +.Cd pseudo-device mpls .In sys/types.h .In netmpls/mpls.h .Sh DESCRIPTION
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Fri Sep 14 08:11:30 UTC 2018 Modified Files: src/share/man/man4: mpls.4 Log Message: pseudo-device ifmpls was renamed to mpls long ago. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/mpls.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftosb/usr.sbin
Module Name:src Committed By: skrll Date: Fri Sep 14 07:07:41 UTC 2018 Modified Files: src/external/bsd/elftosb/usr.sbin/elftosb: elftosb.8 src/external/bsd/elftosb/usr.sbin/sbkeygen: sbkeygen.8 src/external/bsd/elftosb/usr.sbin/sbtool: sbtool.8 Log Message: Fix the "programm" spello To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 diff -u src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.3 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.4 --- src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8:1.3 Sat Oct 26 22:58:29 2013 +++ src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 Fri Sep 14 07:07:41 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: elftosb.8,v 1.3 2013/10/26 22:58:29 wiz Exp $ +.\" $NetBSD: elftosb.8,v 1.4 2018/09/14 07:07:41 skrll Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -51,7 +51,7 @@ .Sh DESCRIPTION The .Nm -programm is used to create a digitaly signed secure boot (sb) file. +program is used to create a digitaly signed secure boot (sb) file. This sb file can be booted by the first stage boot loader found in Freescale i.MX23 and i.MX28 application processors. One or several ELF files and optionally a key are taken as input and @@ -66,4 +66,4 @@ Copyright (c) 2004-2010 Freescale Semico .Sh BUGS The .Nm -programm and its command file syntax are poorly documented. +program and its command file syntax are poorly documented. Index: src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 diff -u src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.2 src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.3 --- src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8:1.2 Sat Oct 26 22:58:04 2013 +++ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 Fri Sep 14 07:07:41 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: sbkeygen.8,v 1.2 2013/10/26 22:58:04 wiz Exp $ +.\" $NetBSD: sbkeygen.8,v 1.3 2018/09/14 07:07:41 skrll Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,15 +44,15 @@ and .Sh DESCRIPTION The .Nm -programm is used to generate cryptographic keys for the +program is used to generate cryptographic keys for the .Xr elftosb 8 and .Xr sbtool 8 -programms. +programs. .Pp The .Nm -programm is called keygen by Freescale. +program is called keygen by Freescale. It was renamed to .Nm when imported into @@ -68,4 +68,4 @@ Copyright (c) 2004-2010 Freescale Semico .Sh BUGS The .Nm -programm is poorly documented. +program is poorly documented. Index: src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 diff -u src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.2 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.3 --- src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8:1.2 Sat Oct 26 22:59:28 2013 +++ src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Fri Sep 14 07:07:41 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: sbtool.8,v 1.2 2013/10/26 22:59:28 wiz Exp $ +.\" $NetBSD: sbtool.8,v 1.3 2018/09/14 07:07:41 skrll Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -45,7 +45,7 @@ .Sh DESCRIPTION The .Nm -programm is used to manipulate sb boot files for Freescale +program is used to manipulate sb boot files for Freescale i.MX23 and i.MX28 application processors. .Sh SEE ALSO .Xr elftosb 8 , @@ -57,4 +57,4 @@ Copyright (c) 2004-2010 Freescale Semico .Sh BUGS The .Nm -programm is poorly documented. +program is poorly documented.
CVS commit: src/external/bsd/elftosb/usr.sbin
Module Name:src Committed By: skrll Date: Fri Sep 14 07:07:41 UTC 2018 Modified Files: src/external/bsd/elftosb/usr.sbin/elftosb: elftosb.8 src/external/bsd/elftosb/usr.sbin/sbkeygen: sbkeygen.8 src/external/bsd/elftosb/usr.sbin/sbtool: sbtool.8 Log Message: Fix the "programm" spello To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftosb/usr.sbin/elftosb/elftosb.8 cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/elftosb/usr.sbin/sbkeygen/sbkeygen.8 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftosb/usr.sbin/sbtool/sbtool.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Fri Sep 14 07:01:28 UTC 2018 Removed Files: src/sys/kern: kern_xxx.c Log Message: remove obsolete file missed while splitting it! thanks wiz. To generate a diff of this commit: cvs rdiff -u -r1.74 -r0 src/sys/kern/kern_xxx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: mrg Date: Fri Sep 14 07:01:28 UTC 2018 Removed Files: src/sys/kern: kern_xxx.c Log Message: remove obsolete file missed while splitting it! thanks wiz. To generate a diff of this commit: cvs rdiff -u -r1.74 -r0 src/sys/kern/kern_xxx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Fri Sep 14 06:21:17 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Add entry for the need to use localcount(9) to protect removal of vectored routine pointers. Thanks riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.3 src/doc/TODO.compat-module:1.1.2.4 --- src/doc/TODO.compat-module:1.1.2.3 Tue Sep 11 08:42:45 2018 +++ src/doc/TODO.compat-module Fri Sep 14 06:21:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.3 2018/09/11 08:42:45 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.4 2018/09/14 06:21:17 pgoyette Exp $ */ DONE @@ -50,6 +50,11 @@ TODO - Required for branch merge also the compat_netbsd32_sysv module) with individual modules. Update dependencies accordingly. +2. Wherever we have vectors function calls, we need to protect all uses +of the vector using localcount(9). And when unloading a module, we +need to localcount_drain() after replacing the function pointer but +before letting the module disappear. + TODO - Not required for branch merge
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Fri Sep 14 06:21:17 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Add entry for the need to use localcount(9) to protect removal of vectored routine pointers. Thanks riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
