CVS commit: src/distrib/sets/lists
Module Name:src Committed By: dholland Date: Sat Jul 26 06:12:31 UTC 2014 Modified Files: src/distrib/sets/lists/base: md.sparc64 src/distrib/sets/lists/comp: md.sparc64 Log Message: fix MKPAM=no build To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/comp/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.228 src/distrib/sets/lists/base/md.sparc64:1.229 --- src/distrib/sets/lists/base/md.sparc64:1.228 Fri Jul 25 08:32:21 2014 +++ src/distrib/sets/lists/base/md.sparc64 Sat Jul 26 06:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.228 2014/07/25 08:32:21 dholland Exp $ +# $NetBSD: md.sparc64,v 1.229 2014/07/26 06:12:30 dholland Exp $ ./lib/sparc base-npf-shlib compat ./lib/sparc/npf base-npf-shlib compat ./lib/sparc/npf/ext_log.so base-npf-shlib compat,pic @@ -228,8 +228,8 @@ ./usr/lib/sparc/libossaudio.so.1.1 base-compat-shlib compat,pic ./usr/lib/sparc/libp2k.so.2 base-compat-shlib compat,pic,rump ./usr/lib/sparc/libp2k.so.2.0 base-compat-shlib compat,pic,rump -./usr/lib/sparc/libpam.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/libpam.so.4.0 base-compat-shlib compat,pic +./usr/lib/sparc/libpam.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/libpam.so.4.0 base-compat-shlib compat,pic,pam ./usr/lib/sparc/libpcap.so.5 base-compat-shlib compat,pic ./usr/lib/sparc/libpcap.so.5.0 base-compat-shlib compat,pic ./usr/lib/sparc/libpci.so.2 base-compat-shlib compat,pic @@ -339,28 +339,28 @@ ./usr/lib/sparc/npf/ext_rndblock.so.0 base-obsolete obsolete ./usr/lib/sparc/npf/ext_rndblock.so.0.0 base-obsolete obsolete ./usr/lib/sparc/security base-compat-shlib compat -./usr/lib/sparc/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos -./usr/lib/sparc/security/pam_chroot.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_deny.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_echo.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_exec.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_ftpusers.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_group.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_guest.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_krb5.so.4 base-compat-shlib compat,pic,kerberos -./usr/lib/sparc/security/pam_ksu.so.4 base-compat-shlib compat,pic,kerberos -./usr/lib/sparc/security/pam_lastlog.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_login_access.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_nologin.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_permit.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_radius.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_rhosts.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_rootok.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_securetty.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_self.so.4 base-compat-shlib compat,pic -./usr/lib/sparc/security/pam_skey.so.4 base-compat-shlib compat,pic,skey -./usr/lib/sparc/security/pam_ssh.so.4 base-compat-shlib compat,pic,crypto -./usr/lib/sparc/security/pam_unix.so.4 base-compat-shlib compat,pic +./usr/lib/sparc/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/sparc/security/pam_chroot.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_deny.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_echo.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_exec.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_ftpusers.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_group.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_guest.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_krb5.so.4 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/sparc/security/pam_ksu.so.4 base-compat-shlib compat,pic,kerberos,pam +./usr/lib/sparc/security/pam_lastlog.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_login_access.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_nologin.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_permit.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_radius.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_rhosts.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_rootok.so.4 base-compat-shlib compat,pic,pam +./usr/lib/sparc/security/pam_securetty.so.4 base-compat-shlib compat,pic,pam
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 06:20:25 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: jiffies.h
Log Message:
Make Linux usecs_to_jiffies work with hz up to 2000.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/jiffies.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/external/bsd/drm2/include/linux/jiffies.h
diff -u src/sys/external/bsd/drm2/include/linux/jiffies.h:1.4 src/sys/external/bsd/drm2/include/linux/jiffies.h:1.5
--- src/sys/external/bsd/drm2/include/linux/jiffies.h:1.4 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/jiffies.h Sat Jul 26 06:20:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: jiffies.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: jiffies.h,v 1.5 2014/07/26 06:20:25 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -56,7 +56,19 @@ jiffies_to_msecs(unsigned int j)
static inline unsigned int
usecs_to_jiffies(unsigned int usec)
{
- return mstohz((usec + (1000 / hz) - 1) / (1000 / hz));
+ if (hz = 100)
+ return mstohz(roundup(usec, (1000 / hz)));
+
+ /*
+ * Avoid integer overflow on 32-bit platforms. The cutoff is
+ * kinda arbitrary; for hz = 2000, 0x20 is safe, but both
+ * values could wiggle around a little.
+ */
+ KASSERT(hz = 2000);
+ if (usec = 0x20)
+ return ((usec * hz) / 100);
+ else
+ return ((usec / 100) * hz);
}
static inline unsigned int
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 06:26:39 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: i2c-algo-bit.h
Log Message:
Fill in i2c_bit_add_bus.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/include/linux/i2c-algo-bit.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/external/bsd/drm2/include/linux/i2c-algo-bit.h
diff -u src/sys/external/bsd/drm2/include/linux/i2c-algo-bit.h:1.3 src/sys/external/bsd/drm2/include/linux/i2c-algo-bit.h:1.4
--- src/sys/external/bsd/drm2/include/linux/i2c-algo-bit.h:1.3 Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/i2c-algo-bit.h Sat Jul 26 06:26:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c-algo-bit.h,v 1.3 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: i2c-algo-bit.h,v 1.4 2014/07/26 06:26:39 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _LINUX_I2C_ALGO_BIT_H_
#define _LINUX_I2C_ALGO_BIT_H_
-struct i2c_adapter;
+#include linux/i2c.h
struct i2c_algo_bit_data {
void *data;
@@ -46,15 +46,17 @@ struct i2c_algo_bit_data {
int timeout;
};
-static inline int
-i2c_bit_add_bus(struct i2c_adapter *adapter __unused)
-{
- return 0;
-}
-
/* XXX Make the nm output a little more greppable... */
#define i2c_bit_algo linux_i2c_bit_algo
extern const struct i2c_algorithm i2c_bit_algo;
+static inline int
+i2c_bit_add_bus(struct i2c_adapter *adapter)
+{
+
+ adapter-algo = i2c_bit_algo;
+ return 0;
+}
+
#endif /* _LINUX_I2C_ALGO_BIT_H_ */
CVS commit: src/sys/external/bsd/drm2/dist/drm/ttm
Module Name:src Committed By: riastradh Date: Sat Jul 26 06:34:12 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c Log Message: Don't ttm_tt_destroy bo-ttm if bo-destroy will destroy it too. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.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/external/bsd/drm2/dist/drm/ttm/ttm_bo.c diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.2 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.2 Wed Jul 16 20:59:57 2014 +++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sat Jul 26 06:34:12 2014 @@ -159,7 +159,7 @@ static void ttm_bo_release_list(struct k BUG_ON(!list_empty(bo-lru)); BUG_ON(!list_empty(bo-ddestroy)); - if (bo-ttm) + if (bo-destroy == NULL bo-ttm) ttm_tt_destroy(bo-ttm); atomic_dec(bo-glob-bo_count); if (bo-resv == bo-ttm_resv)
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src Committed By: riastradh Date: Sat Jul 26 06:37:53 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c Log Message: Fix botched conversion from ALIGN to round_up (not DIV_ROUND_UP!). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.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/external/bsd/drm2/dist/drm/radeon/radeon_fb.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.3 Fri Jul 25 12:48:34 2014 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Sat Jul 26 06:37:53 2014 @@ -128,14 +128,14 @@ static int radeonfb_create_pinned_object fb_tiled) * ((bpp + 1) / 8); if (rdev-family = CHIP_R600) -#ifdef __NetBSD__ - height = DIV_ROUND_UP(mode_cmd-height, 8); +#ifdef __NetBSD__ /* XXX ALIGN means something else. */ + height = round_up(mode_cmd-height, 8); #else height = ALIGN(mode_cmd-height, 8); #endif size = mode_cmd-pitches[0] * height; -#ifdef __NetBSD__ - aligned_size = DIV_ROUND_UP (size, PAGE_SIZE); +#ifdef __NetBSD__ /* XXX ALIGN means something else. */ + aligned_size = round_up(size, PAGE_SIZE); #else aligned_size = ALIGN(size, PAGE_SIZE); #endif
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 07:02:13 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c
Log Message:
Fix radeon framebuffer mmapping.
The framebuffer is not a system-RAM-backed, TTM-managed object;
rather, it is a VRAM-backed object. So we have to use its bus
address, which is a little less sketchy with bus_space_mmap anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/external/bsd/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.2 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.3
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.2 Fri Jul 25 16:35:43 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Sat Jul 26 07:02:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.2 2014/07/25 16:35:43 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.3 2014/07/26 07:02:13 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeondrmkmsfb.c,v 1.2 2014/07/25 16:35:43 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeondrmkmsfb.c,v 1.3 2014/07/26 07:02:13 riastradh Exp $);
#ifdef _KERNEL_OPT
#include vga.h
@@ -273,21 +273,17 @@ radeonfb_genfb_mmap(void *v, void *vs, o
/* Treat low memory as the framebuffer itself. */
if (offset genfb-sc_fbsize) {
const unsigned num_pages __diagused = rbo-tbo.num_pages;
- bus_addr_t addr;
int flags = 0;
KASSERT(genfb-sc_fbsize == (num_pages PAGE_SHIFT));
- KASSERT(num_pages == rbo-tbo.ttm-num_pages);
- addr = page_to_phys(rbo-tbo.ttm-pages[offset PAGE_SHIFT]);
- /* XXX CACHEABLE/ PREFETCHABLE? WC? WB? */
- if (ISSET(rbo-tbo.mem.placement, TTM_PL_FLAG_CACHED))
+ KASSERT(rbo-tbo.mem.bus.is_iomem);
+
+ if (ISSET(rbo-tbo.mem.placement, TTM_PL_FLAG_WC))
flags |= BUS_SPACE_MAP_PREFETCHABLE;
- /*
- * XXX Urk. We assume bus_space_mmap can cope with
- * normal system RAM addresses.
- */
- return bus_space_mmap(rbo-tbo.bdev-memt, addr, 0, prot,
- flags);
+
+ return bus_space_mmap(rbo-tbo.bdev-memt,
+ rbo-tbo.mem.bus.base, rbo-tbo.mem.bus.offset + offset,
+ prot, flags);
}
/* XXX Cargo-culted from genfb_pci. */
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 07:32:18 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/radeon: radeon_pci.c
Log Message:
Defer real radeon attachment until mountroot so we can load firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/radeon/radeon_pci.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/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.2 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.3
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.2 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Sat Jul 26 07:32:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.2 2014/07/25 12:35:03 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.3 2014/07/26 07:32:18 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.2 2014/07/25 12:35:03 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.3 2014/07/26 07:32:18 riastradh Exp $);
#ifdef _KERNEL_OPT
#include vga.h
@@ -71,6 +71,7 @@ SIMPLEQ_HEAD(radeon_task_head, radeon_ta
struct radeon_softc {
device_t sc_dev;
+ struct pci_attach_args sc_pa;
enum {
RADEON_TASK_ATTACH,
RADEON_TASK_WORKQUEUE,
@@ -96,6 +97,7 @@ static bool radeon_pci_lookup(const stru
static int radeon_match(device_t, cfdata_t, void *);
static void radeon_attach(device_t, device_t, void *);
+static void radeon_attach_real(device_t);
static int radeon_detach(device_t, int);
static void radeon_task_work(struct work *, void *);
@@ -152,6 +154,25 @@ radeon_attach(device_t parent, device_t
{
struct radeon_softc *const sc = device_private(self);
const struct pci_attach_args *const pa = aux;
+
+ pci_aprint_devinfo(pa, NULL);
+
+ /*
+ * Trivial initialization first; the rest will come after we
+ * have mounted the root file system and can load firmware
+ * images.
+ */
+ sc-sc_dev = NULL;
+ sc-sc_pa = *pa;
+
+ config_mountroot(self, radeon_attach_real);
+}
+
+static void
+radeon_attach_real(device_t self)
+{
+ struct radeon_softc *const sc = device_private(self);
+ const struct pci_attach_args *const pa = sc-sc_pa;
bool ok __diagused;
unsigned long flags;
int error;
@@ -159,10 +180,6 @@ radeon_attach(device_t parent, device_t
ok = radeon_pci_lookup(pa, flags);
KASSERT(ok);
- sc-sc_dev = self;
-
- pci_aprint_devinfo(pa, NULL);
-
sc-sc_task_state = RADEON_TASK_ATTACH;
SIMPLEQ_INIT(sc-sc_task_u.attach);
@@ -171,7 +188,7 @@ radeon_attach(device_t parent, device_t
flags, sc-sc_drm_dev);
if (error) {
aprint_error_dev(self, unable to attach drm: %d\n, error);
- return;
+ goto out;
}
while (!SIMPLEQ_EMPTY(sc-sc_task_u.attach)) {
@@ -189,8 +206,10 @@ radeon_attach(device_t parent, device_t
aprint_error_dev(self, unable to create workqueue: %d\n,
error);
sc-sc_task_u.workqueue = NULL;
- return;
+ goto out;
}
+
+out: sc-sc_dev = self;
}
static int
@@ -199,6 +218,10 @@ radeon_detach(device_t self, int flags)
struct radeon_softc *const sc = device_private(self);
int error;
+ if (sc-sc_dev == NULL)
+ /* Not done attaching. */
+ return EBUSY;
+
/* XXX Check for in-use before tearing it all down... */
error = config_detach_children(self, flags);
if (error)
CVS commit: src/sys
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 07:36:09 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: DRMKMS
src/sys/arch/i386/conf: DRMKMS
src/sys/external/bsd/drm2/radeon: files.radeon radeon_pci.c
Log Message:
Rename radeondrmkms to just plain radeon.
radeondrmkmsfb will stay as is until the name radeonfb is available
(currently taken by legacy dev/pci/radeonfb.c).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/radeon/files.radeon \
src/sys/external/bsd/drm2/radeon/radeon_pci.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/amd64/conf/DRMKMS
diff -u src/sys/arch/amd64/conf/DRMKMS:1.7 src/sys/arch/amd64/conf/DRMKMS:1.8
--- src/sys/arch/amd64/conf/DRMKMS:1.7 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/DRMKMS Sat Jul 26 07:36:09 2014
@@ -3,7 +3,7 @@ include arch/amd64/conf/NO_DRM
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
-radeondrmkms* at pci? dev ? function ?
+radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
Index: src/sys/arch/i386/conf/DRMKMS
diff -u src/sys/arch/i386/conf/DRMKMS:1.5 src/sys/arch/i386/conf/DRMKMS:1.6
--- src/sys/arch/i386/conf/DRMKMS:1.5 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/i386/conf/DRMKMS Sat Jul 26 07:36:09 2014
@@ -3,7 +3,7 @@ include arch/i386/conf/NO_DRM
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
-radeondrmkms* at pci? dev ? function ?
+radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.3 src/sys/external/bsd/drm2/radeon/files.radeon:1.4
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.3 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/files.radeon Sat Jul 26 07:36:09 2014
@@ -1,164 +1,164 @@
-# $NetBSD: files.radeon,v 1.3 2014/07/25 12:35:03 riastradh Exp $
+# $NetBSD: files.radeon,v 1.4 2014/07/26 07:36:09 riastradh Exp $
define radeonfbbus { }
-device radeondrmkms: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus
-attach radeondrmkms at pci
+device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus
+attach radeon at pci
# XXX Rename this to radeonfb when the legacy radeonfb(4) is gone.
device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev
attach radeondrmkmsfb at radeonfbbus
-makeoptions radeondrmkms CPPFLAGS+=-I$S/external/bsd/drm2/dist/drm/radeon
-makeoptions radeondrmkms CPPFLAGS+=-I$S/external/bsd/drm2/include/radeon
-makeoptions radeondrmkms CPPFLAGS+=-I$S/external/bsd/drm2/radeon
-
-makeoptions radeondrmkms CWARNFLAGS.atombios_encoders.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.atombios_i2c.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.btc_dpm.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.ci_dpm.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.cik.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.cik_sdma.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.dce6_afmt.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.evergreen.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.evergreen_cs.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.kv_dpm.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.kv_dpm.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.kv_dpm.c+=-Wno-shadow
-makeoptions radeondrmkms CWARNFLAGS.kv_dpm.c+=-Wno-type-limits
-makeoptions radeondrmkms CWARNFLAGS.ni.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.ni_dpm.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.r600.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.r600_cs.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.r600_cs.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.r600_cs.c+=-Wno-shadow
-makeoptions radeondrmkms CWARNFLAGS.r600_dpm.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.radeon_atombios.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.radeon_atombios.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.radeon_clocks.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.radeon_combios.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.radeon_combios.c+=-Wno-prototypes-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.radeon_drv.c+=-Wno-missing-field-initializers
-makeoptions radeondrmkms CWARNFLAGS.radeon_gem.c+=-Wno-missing-prototypes
-makeoptions radeondrmkms CWARNFLAGS.radeon_irq_kms.c+=-Wno-missing-prototypes
-makeoptions
CVS commit: src/sys/external/bsd/drm2/pci
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 07:53:14 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
Report the same PCI domain (cf_unit) as everything else in NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/pci/drm_pci.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/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.5 src/sys/external/bsd/drm2/pci/drm_pci.c:1.6
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.5 Thu Jul 17 21:13:49 2014
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sat Jul 26 07:53:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.5 2014/07/17 21:13:49 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.6 2014/07/26 07:53:14 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_pci.c,v 1.5 2014/07/17 21:13:49 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_pci.c,v 1.6 2014/07/26 07:53:14 riastradh Exp $);
#include sys/types.h
#include sys/errno.h
@@ -280,7 +280,7 @@ drm_pci_get_name(struct drm_device *dev)
static int
drm_pci_format_unique(struct drm_device *dev, char *buf, size_t size)
{
- const unsigned int domain = 0; /* XXX PCI domains? */
+ const unsigned int domain = device_unit(device_parent(dev-dev));
const unsigned int bus = dev-pdev-pd_pa.pa_bus;
const unsigned int device = dev-pdev-pd_pa.pa_device;
const unsigned int function = dev-pdev-pd_pa.pa_function;
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-ati
Module Name:src
Committed By: mrg
Date: Sat Jul 26 08:04:54 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile
Log Message:
link against libdrm_radeon, from @riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.4 Sun Aug 3 14:47:26 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile Sat Jul 26 08:04:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/26 08:04:54 mrg Exp $
DRIVER= xf86-video-ati
DRIVER_NAME= ati_drv
@@ -6,4 +6,6 @@ DRIVER_NAME= ati_drv
SRCS= ati.c atimodule.c
MAN= ati.4
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+
.include ../Makefile.xf86-driver
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: mrg
Date: Sat Jul 26 08:05:15 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
enable KMS on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.14 Tue Jun 12 12:26:42 2012
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Sat Jul 26 08:05:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/06/12 12:26:42 rjs Exp $
+# $NetBSD: Makefile,v 1.15 2014/07/26 08:05:15 mrg Exp $
.include bsd.own.mk
@@ -16,7 +16,11 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
-#RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+# XXX
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+CPPFLAGS+= -DXF86DRM_MODE
+.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
r600_textured_videofuncs.c r600_shader.c \
@@ -32,7 +36,8 @@ SRCS= radeon_accel.c radeon_cursor.c \
radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
- $(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
+ $(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
+ $(SRCS.KMS)
MAN= radeon.4
CPPFLAGS+= -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
CVS commit: src/sys/external/bsd/dwc2/dist
Module Name:src
Committed By: skrll
Date: Sat Jul 26 09:18:53 UTC 2014
Modified Files:
src/sys/external/bsd/dwc2/dist: dwc2_hcdintr.c
Log Message:
Recover from channel halt errors by using the 3 strikes xacterr rule.
Adapted from the RaspberryPI linux driver.
This allows the rum(4) I was sent to be somewhat usable. Need to
investigate further what is causing the problem in the first place.
Might help PR/49019 (RPI: interrupt storm when url0 is up)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.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/external/bsd/dwc2/dist/dwc2_hcdintr.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.8 src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.9
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.8 Thu Apr 3 06:34:58 2014
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Sat Jul 26 09:18:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcdintr.c,v 1.8 2014/04/03 06:34:58 skrll Exp $ */
+/* $NetBSD: dwc2_hcdintr.c,v 1.9 2014/07/26 09:18:53 skrll Exp $ */
/*
* hcd_intr.c - DesignWare HS OTG Controller host-mode interrupt handling
@@ -40,7 +40,7 @@
* This file contains the interrupt handlers for Host mode
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2_hcdintr.c,v 1.8 2014/04/03 06:34:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2_hcdintr.c,v 1.9 2014/07/26 09:18:53 skrll Exp $);
#include sys/types.h
#include sys/pool.h
@@ -1891,12 +1891,20 @@ static void dwc2_hc_chhltd_intr_dma(stru
hcint 0x%08x, intsts 0x%08x\n,
chan-hcint,
DWC2_READ_4(hsotg, GINTSTS));
+goto error;
}
}
} else {
dev_info(hsotg-dev,
NYET/NAK/ACK/other in non-error case, 0x%08x\n,
chan-hcint);
+error:
+ /* use the 3-strikes rule */
+ qtd-error_count++;
+ dwc2_update_urb_state_abn(hsotg, chan, chnum, qtd-urb,
+ qtd, DWC2_HC_XFER_XACT_ERR);
+ dwc2_hcd_save_data_toggle(hsotg, chan, chnum, qtd);
+ dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_XACT_ERR);
}
}
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Sat Jul 26 11:23:46 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Don't use saved EREG registers because sljit 0.91 can generate
bogus code on amd64. The A and X registers are saved on the stack.
The most recent version of sljit fixes bogus code generation but
it's not backward compatible with sljit 0.91.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/net/bpfjit.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/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.31 src/sys/net/bpfjit.c:1.32
--- src/sys/net/bpfjit.c:1.31 Thu Jul 24 22:54:38 2014
+++ src/sys/net/bpfjit.c Sat Jul 26 11:23:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.31 2014/07/24 22:54:38 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.31 2014/07/24 22:54:38 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.31 2014/07/24 22:54:38 alnsn Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $);
#endif
#include sys/types.h
@@ -89,12 +89,11 @@ __RCSID($NetBSD: bpfjit.c,v 1.31 2014/0
#define BJ_BUF SLJIT_SAVED_REG1
//#define BJ_ARGS SLJIT_SAVED_REG2
#define BJ_BUFLEN SLJIT_SAVED_REG3
-#define BJ_XREG SLJIT_SAVED_EREG1
-#define BJ_ASAVE SLJIT_SAVED_EREG2
#define BJ_AREG SLJIT_SCRATCH_REG1
#define BJ_TMP1REG SLJIT_SCRATCH_REG2
#define BJ_TMP2REG SLJIT_SCRATCH_REG3
-#define BJ_TMP3REG SLJIT_TEMPORARY_EREG1
+#define BJ_XREG SLJIT_TEMPORARY_EREG1
+#define BJ_TMP3REG SLJIT_TEMPORARY_EREG2
#ifdef _KERNEL
#define MAX_MEMWORDS BPF_MAX_MEMWORDS
@@ -136,6 +135,7 @@ struct bpfjit_stack
{
bpf_ctx_t *ctx;
uint32_t *extmem; /* pointer to external memory store */
+ uint32_t reg; /* saved A or X register */
#ifdef _KERNEL
int err; /* 3rd argument for m_xword/m_xhalf/m_xbyte function call */
#endif
@@ -259,8 +259,16 @@ nscratches(bpfjit_hint_t hints)
if (hints BJ_HINT_COP)
rv = 3; /* calls copfunc with three arguments */
+ if (hints BJ_HINT_XREG)
+ rv = 4; /* uses BJ_XREG */
+
+#ifdef _KERNEL
+ if (hints BJ_HINT_LDX)
+ rv = 5; /* uses BJ_TMP3REG */
+#endif
+
if (hints BJ_HINT_COPX)
- rv = 4; /* uses BJ_TMP3REG */
+ rv = 5; /* uses BJ_TMP3REG */
return rv;
}
@@ -274,14 +282,6 @@ nsaveds(bpfjit_hint_t hints)
{
sljit_si rv = 3;
- if (hints BJ_HINT_XREG)
- rv = 4; /* uses BJ_XREG */
-
-#ifdef _KERNEL
- if (hints BJ_HINT_LDX)
- rv = 5; /* uses BJ_ASAVE */
-#endif
-
return rv;
}
@@ -528,21 +528,30 @@ emit_read32(struct sljit_compiler *compi
* BPF_LDX+BPF_B+BPF_MSH X - 4*(P[k:1]0xf)
*/
static int
-emit_xcall(struct sljit_compiler *compiler, const struct bpf_insn *pc,
-int dst, struct sljit_jump ***ret0, size_t *ret0_size, size_t *ret0_maxsize,
+emit_xcall(struct sljit_compiler *compiler, bpfjit_hint_t hints,
+const struct bpf_insn *pc, int dst, struct sljit_jump ***ret0,
+size_t *ret0_size, size_t *ret0_maxsize,
uint32_t (*fn)(const struct mbuf *, uint32_t, int *))
{
+#if BJ_XREG == SLJIT_RETURN_REG || \
+BJ_XREG == SLJIT_SCRATCH_REG1 || \
+BJ_XREG == SLJIT_SCRATCH_REG2 || \
+BJ_XREG == SLJIT_SCRATCH_REG3
+#error Not supported assignment of registers.
+#endif
struct sljit_jump *jump;
+ sljit_si save_reg;
int status;
- BJ_ASSERT(dst != BJ_ASAVE);
+ save_reg = (BPF_CLASS(pc-code) == BPF_LDX) ? BJ_AREG : BJ_XREG;
- if (BPF_CLASS(pc-code) == BPF_LDX) {
- /* save A */
+ if (save_reg == BJ_AREG || (hints BJ_HINT_XREG)) {
+ /* save A or X */
status = sljit_emit_op1(compiler,
- SLJIT_MOV,
- BJ_ASAVE, 0,
- BJ_AREG, 0);
+ SLJIT_MOV_UI, /* uint32_t destination */
+ SLJIT_MEM1(SLJIT_LOCALS_REG),
+ offsetof(struct bpfjit_stack, reg),
+ save_reg, 0);
if (status != SLJIT_SUCCESS)
return status;
}
@@ -634,12 +643,13 @@ emit_xcall(struct sljit_compiler *compil
if (!append_jump(jump, ret0, ret0_size, ret0_maxsize))
return SLJIT_ERR_ALLOC_FAILED;
- if (BPF_CLASS(pc-code) == BPF_LDX) {
- /* restore A */
+ if (save_reg == BJ_AREG || (hints BJ_HINT_XREG)) {
+ /* restore A or X */
status = sljit_emit_op1(compiler,
- SLJIT_MOV,
- BJ_AREG, 0,
- BJ_ASAVE, 0);
+ SLJIT_MOV_UI, /* uint32_t source */
+ save_reg, 0,
+ SLJIT_MEM1(SLJIT_LOCALS_REG),
+ offsetof(struct bpfjit_stack, reg));
if (status != SLJIT_SUCCESS)
return status;
}
@@ -652,11 +662,15 @@ emit_xcall(struct sljit_compiler *compil
* Emit code for BPF_COP and BPF_COPX instructions.
*/
static int
-emit_cop(struct sljit_compiler *compiler,
+emit_cop(struct sljit_compiler *compiler, bpfjit_hint_t hints,
const bpf_ctx_t *bc, const struct
CVS commit: src/sys/external/bsd/drm2/dist/drm/ttm
Module Name:src
Committed By: rjs
Date: Sat Jul 26 12:27:57 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_tt.c
Log Message:
Fix non debug build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.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/external/bsd/drm2/dist/drm/ttm/ttm_tt.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.4 Tue Jul 22 15:15:22 2014
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c Sat Jul 26 12:27:57 2014
@@ -316,7 +316,7 @@ EXPORT_SYMBOL(ttm_dma_tt_fini);
void ttm_tt_unbind(struct ttm_tt *ttm)
{
- int ret;
+ int ret __diagused;
if (ttm-state == tt_bound) {
ret = ttm-func-unbind(ttm);
CVS commit: src/sys/arch/luna68k/include
Module Name:src Committed By: tsutsui Date: Sat Jul 26 12:48:07 UTC 2014 Modified Files: src/sys/arch/luna68k/include: vmparam.h Log Message: Sync VM_MAXUSER_ADDRESS and VM_MAX_ADDRESS with other hp300 derived ports. There is no particular reason to have different values among m68k ports. Briefly checked on LUNA-II. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/include/vmparam.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/luna68k/include/vmparam.h diff -u src/sys/arch/luna68k/include/vmparam.h:1.18 src/sys/arch/luna68k/include/vmparam.h:1.19 --- src/sys/arch/luna68k/include/vmparam.h:1.18 Tue Feb 8 20:20:16 2011 +++ src/sys/arch/luna68k/include/vmparam.h Sat Jul 26 12:48:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.18 2011/02/08 20:20:16 rmind Exp $ */ +/* $NetBSD: vmparam.h,v 1.19 2014/07/26 12:48:07 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -94,8 +94,8 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vaddr_t)0) -#define VM_MAXUSER_ADDRESS ((vaddr_t)0xFFFC) -#define VM_MAX_ADDRESS ((vaddr_t)0xFFFC) +#define VM_MAXUSER_ADDRESS ((vaddr_t)0xFFF0) +#define VM_MAX_ADDRESS ((vaddr_t)0xFFF0) #define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(0x4000-PAGE_SIZE*NPTEPG))
CVS commit: src/sys/arch/atari/include
Module Name:src Committed By: tsutsui Date: Sat Jul 26 13:24:34 UTC 2014 Modified Files: src/sys/arch/atari/include: vmparam.h Log Message: Reorganize and bump VM related constants. - sync VM_MAXUSER_ADDRESS and VM_MAX_ADDRESS with other hp300 derived ports and use same definitions for USRSTACK as other m68k ports (no worth to have sun3/sunos compat in these days) - remove unused KUSER_AREA - bump MAXTSIZ, MAXDSIZ, and MAXSSIZ These changes allow my 64MB TT030 build pkgsrc/textproc/icu which seems to require 200MB VA space. (note our current 040/060 pmap implementation can't handle 224MB VA size) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/atari/include/vmparam.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/atari/include/vmparam.h diff -u src/sys/arch/atari/include/vmparam.h:1.28 src/sys/arch/atari/include/vmparam.h:1.29 --- src/sys/arch/atari/include/vmparam.h:1.28 Tue Feb 8 20:20:10 2011 +++ src/sys/arch/atari/include/vmparam.h Sat Jul 26 13:24:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.28 2011/02/08 20:20:10 rmind Exp $ */ +/* $NetBSD: vmparam.h,v 1.29 2014/07/26 13:24:34 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -57,31 +57,27 @@ /* * USRSTACK is the top (end) of the user stack. - * - * These are a mixture of i386, sun3 and hp settings.. */ +#define USRSTACK VM_MAXUSER_ADDRESS -/* Sun settings. Still hope, that I might get sun3 binaries to work... */ -#define USRSTACK 0x0E00 -#define KUSER_AREA (-UPAGES*PAGE_SIZE) /* * Virtual memory related constants, all in bytes */ #ifndef MAXTSIZ -#define MAXTSIZ (6*1024*1024) /* max text size */ +#define MAXTSIZ (16*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ #define DFLDSIZ (32*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (64*1024*1024) /* max data size */ +#define MAXDSIZ (256*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (2*1024*1024) /* initial stack size limit */ #endif #ifndef MAXSSIZ -#define MAXSSIZ (32*1024*1024) /* max stack size */ +#define MAXSSIZ (256*1024*1024) /* max stack size */ #endif /* @@ -103,8 +99,8 @@ * user/kernel map constants */ #define VM_MIN_ADDRESS ((vaddr_t)0) -#define VM_MAX_ADDRESS ((vaddr_t)(USRSTACK)) -#define VM_MAXUSER_ADDRESS ((vaddr_t)(VM_MAX_ADDRESS)) +#define VM_MAX_ADDRESS ((vaddr_t)0xFFF0) +#define VM_MAXUSER_ADDRESS ((vaddr_t)0xFFF0) #define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t)-(NPTEPG * PAGE_SIZE))
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 14:24:08 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: jiffies.h
Log Message:
Use tvtohz instead of ad-hacking it myself, suggested by apb@.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/jiffies.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/external/bsd/drm2/include/linux/jiffies.h
diff -u src/sys/external/bsd/drm2/include/linux/jiffies.h:1.5 src/sys/external/bsd/drm2/include/linux/jiffies.h:1.6
--- src/sys/external/bsd/drm2/include/linux/jiffies.h:1.5 Sat Jul 26 06:20:25 2014
+++ src/sys/external/bsd/drm2/include/linux/jiffies.h Sat Jul 26 14:24:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: jiffies.h,v 1.5 2014/07/26 06:20:25 riastradh Exp $ */
+/* $NetBSD: jiffies.h,v 1.6 2014/07/26 14:24:08 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -56,19 +56,12 @@ jiffies_to_msecs(unsigned int j)
static inline unsigned int
usecs_to_jiffies(unsigned int usec)
{
- if (hz = 100)
- return mstohz(roundup(usec, (1000 / hz)));
+ const struct timeval tv = {
+ .tv_sec = usec / 100,
+ .tv_usec = usec % 100,
+ };
- /*
- * Avoid integer overflow on 32-bit platforms. The cutoff is
- * kinda arbitrary; for hz = 2000, 0x20 is safe, but both
- * values could wiggle around a little.
- */
- KASSERT(hz = 2000);
- if (usec = 0x20)
- return ((usec * hz) / 100);
- else
- return ((usec / 100) * hz);
+ return tvtohz(tv);
}
static inline unsigned int
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Sat Jul 26 14:26:04 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_uncore.c Log Message: Fix __raw_i915_read64 on i386. From rjs@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.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/external/bsd/drm2/dist/drm/i915/intel_uncore.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c:1.5 Mon Jul 21 20:03:31 2014 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c Sat Jul 26 14:26:04 2014 @@ -42,7 +42,7 @@ #define __raw_i915_read64(dev_priv, reg) bus_space_read_8((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg)) #define __raw_i915_write64(dev_priv, reg, val) bus_space_write_8((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg), (val)) #else -#define __raw_i915_read64(dev_priv, reg) (bus_space_read_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg)) | ((uint64_t)bus_space_read_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg)) 32)) +#define __raw_i915_read64(dev_priv, reg) (bus_space_read_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg)) | ((uint64_t)bus_space_read_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg) + 4) 32)) #define __raw_i915_write64(dev_priv, reg, val) (bus_space_write_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg), (uint32_t)(val)), bus_space_write_4((dev_priv)-regs_bst, (dev_priv)-regs_bsh, (reg) + 4, (uint32_t)((val) 32))) #endif
CVS commit: src/sys/external/bsd/drm2/include/drm
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 14:27:40 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h
Log Message:
Avoid needless #ifdef __i386__ with judicious use of MIN.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.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/external/bsd/drm2/include/drm/bus_dma_hacks.h
diff -u src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.6 src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.7
--- src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.6 Tue Jul 22 22:14:22 2014
+++ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h Sat Jul 26 14:27:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma_hacks.h,v 1.6 2014/07/22 22:14:22 riastradh Exp $ */
+/* $NetBSD: bus_dma_hacks.h,v 1.7 2014/07/26 14:27:40 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -131,12 +131,8 @@ bus_dmamap_load_pglist(bus_dma_tag_t tag
nsegs = 0;
TAILQ_FOREACH(page, pglist, pageq.queue) {
- if (nsegs == INT_MAX)
+ if (nsegs == MIN(INT_MAX, (SIZE_MAX / sizeof(segs[0]
return ENOMEM;
-#if __i386__
- if (nsegs == (SIZE_MAX / sizeof(segs[0])))
- return ENOMEM;
-#endif
nsegs++;
}
CVS commit: src/sys/net/npf
Module Name:src Committed By: rmind Date: Sat Jul 26 16:42:03 UTC 2014 Modified Files: src/sys/net/npf: npf_conn.c Log Message: npf_conn_conkey: fix a comment. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/net/npf/npf_conn.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/npf/npf_conn.c diff -u src/sys/net/npf/npf_conn.c:1.8 src/sys/net/npf/npf_conn.c:1.9 --- src/sys/net/npf/npf_conn.c:1.8 Fri Jul 25 23:21:46 2014 +++ src/sys/net/npf/npf_conn.c Sat Jul 26 16:42:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_conn.c,v 1.8 2014/07/25 23:21:46 rmind Exp $ */ +/* $NetBSD: npf_conn.c,v 1.9 2014/07/26 16:42:03 rmind Exp $ */ /*- * Copyright (c) 2014 Mindaugas Rasiukevicius rmind at netbsd org @@ -99,7 +99,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.8 2014/07/25 23:21:46 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.9 2014/07/26 16:42:03 rmind Exp $); #include sys/param.h #include sys/types.h @@ -297,9 +297,9 @@ npf_conn_conkey(const npf_cache_t *npc, /* * Construct a key formed out of 32-bit integers. The key layout: * - * Field: | proto | alen | src-id | dst-id | src-addr | dst-addr | - *+---+---+++--+--+ - * Bits: | 8 | 8 | 16 | 16 | 32-128 | 32-128 | + * Field: | proto | alen | src-id | dst-id | src-addr | dst-addr | + *+++++--+--+ + * Bits: | 16 | 16 | 16 | 16 | 32-128 | 32-128 | * * The source and destination are inverted if they key is for the * backwards stream (forw == false). The address length depends
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sat Jul 26 17:16:41 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Improved the NORMAL_GLOBALS macro in the sun4u case, so only the relevant bit (AG) in %pstate is affected - ok martin@ To generate a diff of this commit: cvs rdiff -u -r1.366 -r1.367 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.366 src/sys/arch/sparc64/sparc64/locore.s:1.367 --- src/sys/arch/sparc64/sparc64/locore.s:1.366 Thu Jul 24 18:23:28 2014 +++ src/sys/arch/sparc64/sparc64/locore.s Sat Jul 26 17:16:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.366 2014/07/24 18:23:28 palle Exp $ */ +/* $NetBSD: locore.s,v 1.367 2014/07/26 17:16:41 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -154,7 +154,9 @@ 2: #endif /* sun4u */ - wrpr %g0, PSTATE_KERN, %pstate + rdpr %pstate, \scratch + and \scratch, ~PSTATE_AG, \scratch ! Alternate Globals (AG) bit set to zero + wrpr %g0, \scratch, %pstate 3: .endm
CVS commit: src/sys/arch/sun68k/stand
Module Name:src
Committed By: tsutsui
Date: Sat Jul 26 17:24:04 UTC 2014
Modified Files:
src/sys/arch/sun68k/stand: Makefile.inc
Log Message:
Move sun3 bootloader address to allow loading growing GENERIC kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sun68k/stand/Makefile.inc
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/sun68k/stand/Makefile.inc
diff -u src/sys/arch/sun68k/stand/Makefile.inc:1.24 src/sys/arch/sun68k/stand/Makefile.inc:1.25
--- src/sys/arch/sun68k/stand/Makefile.inc:1.24 Sun Jan 12 15:26:31 2014
+++ src/sys/arch/sun68k/stand/Makefile.inc Sat Jul 26 17:24:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2014/01/12 15:26:31 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.25 2014/07/26 17:24:04 tsutsui Exp $
# Must have S=/usr/src/sys (or equivalent)
# But note: this is w.r.t. a subdirectory
@@ -14,7 +14,11 @@ LIBSA!=cd ${.CURDIR}/../libsa ${PRINT
MDEC_DIR?=/usr/mdec
+.if ${MACHINE} == sun3
+RELOC?= 28
+.else
RELOC?= 24
+.endif
DEFS?= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
INCL?= -I. -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
CVS commit: src/sys/arch/sun2/conf
Module Name:src Committed By: tsutsui Date: Sat Jul 26 17:32:07 UTC 2014 Modified Files: src/sys/arch/sun2/conf: GENERIC Log Message: Shrink GENERIC kernel to fit to bootloader's limit (2MB). Maybe now we can't call it GENERIC, but it still boots on TME. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sun2/conf/GENERIC 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/sun2/conf/GENERIC diff -u src/sys/arch/sun2/conf/GENERIC:1.89 src/sys/arch/sun2/conf/GENERIC:1.90 --- src/sys/arch/sun2/conf/GENERIC:1.89 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sun2/conf/GENERIC Sat Jul 26 17:32:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.89 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: GENERIC,v 1.90 2014/07/26 17:32:07 tsutsui Exp $ # # GENERIC machine description file # @@ -23,9 +23,9 @@ include arch/sun2/conf/std.sun2 -options INCLUDE_CONFIG_FILE # embed config file in kernel binary +#options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.89 $ +#ident GENERIC-$Revision: 1.90 $ makeoptions COPTS=-Os # optimize for size @@ -43,7 +43,7 @@ options SYSVSHM # System V shared memo #options INSECURE # disable kernel security level #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) -options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. @@ -68,23 +68,23 @@ options DDB # Compatibility options #options COMPAT_SUNOS # can run SunOS 4.1.1 executables -options COMPAT_43 # and 4.3BSD and ... +#options COMPAT_43 # and 4.3BSD and ... options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. -options COMPAT_AOUT_M68K # support for NetBSD a.out executables +#options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options EXEC_AOUT # support for a.out executables +#options EXEC_AOUT # support for a.out executables options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Filesystem options file-system FFS # Berkeley Fast Filesystem file-system NFS # Sun NFS client support file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system FDESC # /dev/fd/* +#file-system FDESC # /dev/fd/* file-system KERNFS # /kern file-system NULLFS # loopback file system #file-system OVERLAY # overlay file system @@ -92,14 +92,14 @@ file-system NULLFS # loopback file syst #file-system UNION # union file system file-system MFS # memory-based filesystem file-system PTYFS # /dev/pts/N support -file-system TMPFS # Efficient memory file-system +#file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system -options NFSSERVER # nfs server support +#options NFSSERVER # nfs server support #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support -options WAPBL # File system journaling support +#options WAPBL # File system journaling support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental #options NFS_V2_ONLY # Exclude NFS3 code to save space options FFS_NO_SNAPSHOT # No FFS snapshot support @@ -221,15 +221,15 @@ options SCSI_OLD_NOINQUIRY ## Xylogics 450 or 451 Multibus/VME SMD disk controllers and disks. #xyc0 at mbio0 addr 0xee40 ipl 2 -xyc0 at vme0 addr 0xee40 irq 2 vect 0x48 +#xyc0 at vme0 addr 0xee40 irq 2 vect 0x48 #xyc1 at mbio0 addr 0xee48 ipl 2 -xyc1 at vme0 addr 0xee48 irq 2 vect 0x49 -xy* at xyc? drive ? +#xyc1 at vme0 addr 0xee48 irq 2 vect 0x49 +#xy* at xyc? drive ? # # accept filters -pseudo-device accf_data # dataready accept filter -pseudo-device accf_http # httpready accept filter +#pseudo-device accf_data # dataready accept filter +#pseudo-device accf_http # httpready accept filter ## Memory-disk device. pseudo-device md @@ -292,7 +292,7 @@ pseudo-device pty # pseudo-terminals # options RF_INCLUDE_PARITY_DECLUSTERING=1 # options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 #pseudo-device fss # file system snapshot device -pseudo-device clockctl # user control of clock subsystem +#pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if
CVS commit: src/sys/arch/sun2/conf
Module Name:src Committed By: tsutsui Date: Sat Jul 26 17:34:31 UTC 2014 Modified Files: src/sys/arch/sun2/conf: DISKLESS FOURMEG INSTALL Log Message: Comment out options and devices to sync GENERIC rev 1.90. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sun2/conf/DISKLESS cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sun2/conf/FOURMEG cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sun2/conf/INSTALL 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/sun2/conf/DISKLESS diff -u src/sys/arch/sun2/conf/DISKLESS:1.51 src/sys/arch/sun2/conf/DISKLESS:1.52 --- src/sys/arch/sun2/conf/DISKLESS:1.51 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sun2/conf/DISKLESS Sat Jul 26 17:34:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.51 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: DISKLESS,v 1.52 2014/07/26 17:34:31 tsutsui Exp $ # DISKLESS Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, ec0 @@ -7,7 +7,7 @@ include arch/sun2/conf/std.sun2 #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident DISKLESS-$Revision: 1.51 $ +#ident DISKLESS-$Revision: 1.52 $ makeoptions COPTS=-Os # optimize for size @@ -15,7 +15,7 @@ makeoptions COPTS=-Os # optimize for s #options FPU_EMULATE # Needs to be set per system. i.e change these as you see fit -maxusers 8 +maxusers 4 # Standard system options options KTRACE # system call tracing @@ -23,7 +23,7 @@ options SYSVMSG # System V message que options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options INSECURE # disable kernel security level -options USERCONF # userconf(4) support +#options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel @@ -45,26 +45,28 @@ options DDB # Compatibility options #options COMPAT_SUNOS # can run SunOS 4.1.1 executables -options COMPAT_43 # and 4.3BSD and ... +#options COMPAT_43 # and 4.3BSD and ... options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 compatibility. +options COMPAT_50 # NetBSD 5.0 compatibility. +options COMPAT_60 # NetBSD 6.0 compatibility. #options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options EXEC_AOUT # support for a.out executables +#options EXEC_AOUT # support for a.out executables options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Filesystem options #file-system FFS # Berkeley Fast Filesystem file-system NFS # Sun NFS client support #file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system FDESC # /dev/fd/* +#file-system FDESC # /dev/fd/* file-system KERNFS # /kern file-system NULLFS # loopback file system -file-system OVERLAY # overlay file system +#file-system OVERLAY # overlay file system #file-system PROCFS # /proc -file-system UNION # union file system +#file-system UNION # union file system file-system MFS # memory-based filesystem file-system PTYFS # /dev/pts/N support @@ -229,4 +231,4 @@ pseudo-device pty # pseudo-terminals #options RAID_AUTOCONFIG # auto-configuration of RAID components #pseudo-device fss # file system snapshot device -pseudo-device clockctl # user control of clock subsystem +#pseudo-device clockctl # user control of clock subsystem Index: src/sys/arch/sun2/conf/FOURMEG diff -u src/sys/arch/sun2/conf/FOURMEG:1.55 src/sys/arch/sun2/conf/FOURMEG:1.56 --- src/sys/arch/sun2/conf/FOURMEG:1.55 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sun2/conf/FOURMEG Sat Jul 26 17:34:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.55 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: FOURMEG,v 1.56 2014/07/26 17:34:31 tsutsui Exp $ # FOURMEG Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include arch/sun2/conf/std.sun2 #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident FOURMEG-$Revision: 1.55 $ +#ident FOURMEG-$Revision: 1.56 $ makeoptions COPTS=-Os # optimize for size @@ -50,9 +50,11 @@ options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 options COMPAT_40 # NetBSD 4.0 compatibility. +options COMPAT_50 # NetBSD 5.0 compatibility. +options COMPAT_60 # NetBSD 6.0 compatibility. #options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options EXEC_AOUT # support for a.out executables +#options EXEC_AOUT # support for a.out executables options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Filesystem options @@ -178,10 +180,10 @@ options SCSI_OLD_NOINQUIRY ## Xylogics 450 or 451 Multibus/VME SMD disk controllers and disks. #xyc0 at mbio0 addr 0xee40 ipl 2 -xyc0 at vme0
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 18:13:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h
Log Message:
Move CONFIG_X86 from files.i915drmkms to drm_os_netbsd.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.4 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.4 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sat Jul 26 18:13:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.4 2014/07/24 21:18:40 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.5 2014/07/26 18:13:44 riastradh Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus
@@ -16,7 +16,6 @@ makeoptions i915drmkms CWARNFLAGS.int
makeoptions i915drmkms CWARNFLAGS.intel_pm.c+=-Wno-shadow
# XXX x86 kludge.
-makeoptions i915drmkms CPPFLAGS+=-DCONFIG_X86
#makeoptions i915drmkms CPPFLAGS+=-DCONFIG_ACPI
makeoptions i915drmkms CPPFLAGS+=-DCONFIG_DRM_I915_FBDEV
Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.2 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.3
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Sat Jul 26 18:13:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_os_netbsd.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */
+/* $NetBSD: drm_os_netbsd.h,v 1.3 2014/07/26 18:13:44 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,14 @@
#include opt_drmkms.h
#endif
+/*
+ * XXX Better to get rid of CONFIG_X86, but that's not convenient at
+ * the moment.
+ */
+#if defined(__i386__) || defined(__x86_64__)
+#define CONFIG_X86 1
+#endif
+
#include drm/drm_agp_netbsd.h
#include drm/drm_auth_netbsd.h
#include drm/drm_copy_netbsd.h
CVS commit: src
Module Name:src Committed By: dholland Date: Sat Jul 26 19:30:47 UTC 2014 Added Files: src/usr.sbin/sysinst: Makefile Makefile.inc SPELLING.en TODO aout2elf.c bsddisklabel.c checkrc.c configmenu.c defs.h disks.c disks_lfs.c endian.h factor.c geom.c install.c label.c main.c mbr.c mbr.h menus.mbr menus.mi msg.mbr.de msg.mbr.en msg.mbr.es msg.mbr.fr msg.mbr.pl msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl msg_xlat.sh net.c run.c savenewlabel.c sizemultname.c target.c txtwalk.c txtwalk.h unif.awk upgrade.c util.c wskbd.c src/usr.sbin/sysinst/arch/acorn26: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/acorn32: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/alpha: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/amd64: Makefile md.c md.h src/usr.sbin/sysinst/arch/amiga: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr msg.md.de msg.md.en msg.md.es msg.md.fr src/usr.sbin/sysinst/arch/arc: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/atari: Makefile md.c md.h menus.md.en menus.md.es msg.md.de msg.md.en msg.md.es src/usr.sbin/sysinst/arch/bebox: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/cats: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/cobalt: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/emips: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbarm: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbmips: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbppc: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbsh3: Makefile md.c md.h menus.md.en menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/ews4800mips: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hp300: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hpcarm: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/hpcmips: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/hpcsh: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hppa: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/i386: Makefile md.c md.h menus.md msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/landisk: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/luna68k: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/mac68k: Makefile md.c md.h menus.md.de menus.md.en menus.md.es menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.pl src/usr.sbin/sysinst/arch/macppc: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/mipsco: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/mvme68k: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/news68k: Makefile md.c md.h menus.md.en
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: dholland
Date: Sat Jul 26 19:32:22 UTC 2014
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
Update for building in usr.sbin.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.1 src/usr.sbin/sysinst/Makefile.inc:1.2
--- src/usr.sbin/sysinst/Makefile.inc:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/Makefile.inc Sat Jul 26 19:32:22 2014
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/07/26 19:30:44 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/07/26 19:32:22 dholland Exp $
#
# Makefile for sysinst
+.if exists(${.CURDIR}/../../../Makefile.inc)
+.include ${.CURDIR}/../../../Makefile.inc
+.endif
+
.if empty(DBG:M-g)
COPTS += -Os
.endif
@@ -29,7 +33,11 @@ MSG_MD?= msg.md.${SYSINSTLANG}
MENUS_MD?= menus.md.${SYSINSTLANG}
.include bsd.own.mk # for mk.conf
-.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
+#.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
+
+DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+DISTRIBVERDEP= ${NETBSDSRCDIR}/sys/sys/param.h \
+ ${NETBSDSRCDIR}/sys/conf/osrelease.sh
_MKSHTARGET_CREATE?= ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}
CVS commit: src/usr.sbin
Module Name:src Committed By: dholland Date: Sat Jul 26 19:32:37 UTC 2014 Modified Files: src/usr.sbin: Makefile Log Message: Descend into sysinst. To generate a diff of this commit: cvs rdiff -u -r1.268 -r1.269 src/usr.sbin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/Makefile diff -u src/usr.sbin/Makefile:1.268 src/usr.sbin/Makefile:1.269 --- src/usr.sbin/Makefile:1.268 Thu Nov 28 22:34:44 2013 +++ src/usr.sbin/Makefile Sat Jul 26 19:32:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.268 2013/11/28 22:34:44 christos Exp $ +# $NetBSD: Makefile,v 1.269 2014/07/26 19:32:37 dholland Exp $ # from: @(#)Makefile 5.20 (Berkeley) 6/12/93 .include bsd.own.mk @@ -25,7 +25,7 @@ SUBDIR= ac accton acpitools altq apm apm rarpd rbootd rdate repquota rmt rpc.bootparamd rpc.lockd \ rpc.pcnfsd rpc.statd rpcbind rwhod \ sa screenblank sdpd services_mkdb sesd schedctl sliplogin spray \ - srtconfig sti sunlabel sup syslogd \ + srtconfig sti sunlabel sup sysinst syslogd \ tadpolectl tcpdchk tcpdmatch tcpdrop timed tpctl tprof traceroute trpt \ unlink usbdevs user \ videomode vipw veriexecgen vnconfig \
CVS commit: src/distrib
Module Name:src
Committed By: dholland
Date: Sat Jul 26 19:34:08 UTC 2014
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/installimage: Makefile
src/distrib/common: list.sysinst list.sysinst.en
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/installimage: Makefile
src/distrib/ofppc/ramdisks/common: list.sysinst
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Adjust for sysinst move.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.12 -r1.13 src/distrib/common/list.sysinst
cvs rdiff -u -r1.1 -r1.2 src/distrib/common/list.sysinst.en
cvs rdiff -u -r1.29 -r1.30 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/ofppc/ramdisks/common/list.sysinst
cvs rdiff -u -r1.17 -r1.18 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.9 src/distrib/amd64/cdroms/Makefile.cdrom:1.10
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.9 Sun May 18 13:06:12 2014
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.cdrom,v 1.9 2014/05/18 13:06:12 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.10 2014/07/26 19:34:08 dholland Exp $
.include bsd.own.mk
-SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.3 src/distrib/amd64/installimage/Makefile:1.4
--- src/distrib/amd64/installimage/Makefile:1.3 Sat Nov 3 14:25:32 2012
+++ src/distrib/amd64/installimage/Makefile Sat Jul 26 19:34:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
.include bsd.own.mk
@@ -22,7 +22,7 @@ prepare_md_post:
${.CURDIR}/boot.cfg.in boot.cfg
DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA=\
Index: src/distrib/common/list.sysinst
diff -u src/distrib/common/list.sysinst:1.12 src/distrib/common/list.sysinst:1.13
--- src/distrib/common/list.sysinst:1.12 Sat Aug 27 15:42:56 2005
+++ src/distrib/common/list.sysinst Sat Jul 26 19:34:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list.sysinst,v 1.12 2005/08/27 15:42:56 xtraeme Exp $
+# $NetBSD: list.sysinst,v 1.13 2014/07/26 19:34:08 dholland Exp $
#
# list file (c.f. parselist.awk) for sysinst-using install media.
#
@@ -8,7 +8,7 @@
PROG sysinst
PROG usr/bin/progress
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE}
+SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE}
# Foreign texts for sysinst
COPY ${OBJDIR}/sysinst/sysinstmsgs.fr sysinstmsgs.fr
Index: src/distrib/common/list.sysinst.en
diff -u src/distrib/common/list.sysinst.en:1.1 src/distrib/common/list.sysinst.en:1.2
--- src/distrib/common/list.sysinst.en:1.1 Sun Apr 18 20:04:26 2004
+++ src/distrib/common/list.sysinst.en Sat Jul 26 19:34:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list.sysinst.en,v 1.1 2004/04/18 20:04:26 dsl Exp $
+# $NetBSD: list.sysinst.en,v 1.2 2014/07/26 19:34:08 dholland Exp $
#
# list file (c.f. parselist.awk) for sysinst-using install media.
#
@@ -8,4 +8,4 @@
PROG sysinst
PROG usr/bin/progress
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE}
+SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE}
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.29 src/distrib/i386/cdroms/Makefile.cdrom:1.30
--- src/distrib/i386/cdroms/Makefile.cdrom:1.29 Sun May 18 13:06:12 2014
+++ src/distrib/i386/cdroms/Makefile.cdrom Sat Jul 26 19:34:08 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.cdrom,v 1.29 2014/05/18 13:06:12 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.30 2014/07/26 19:34:08 dholland Exp $
.include bsd.own.mk
-SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
Index:
CVS commit: src/distrib/utils
Module Name:src
Committed By: dholland
Date: Sat Jul 26 19:35:10 UTC 2014
Modified Files:
src/distrib/utils: Makefile
Log Message:
Don't descend into sysinst.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/Makefile
diff -u src/distrib/utils/Makefile:1.20 src/distrib/utils/Makefile:1.21
--- src/distrib/utils/Makefile:1.20 Sun Mar 24 20:26:29 2013
+++ src/distrib/utils/Makefile Sat Jul 26 19:35:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/03/24 20:26:29 christos Exp $
+# $NetBSD: Makefile,v 1.21 2014/07/26 19:35:10 dholland Exp $
.if make(obj)
@@ -19,10 +19,6 @@ SUBDIR+=x_ping6
.endif
-.if exists(sysinst/arch/${MACHINE})
-SUBDIR+=sysinst
-.endif
-
release:
.include bsd.subdir.mk
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: dholland Date: Sat Jul 26 19:35:59 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add /usr/sbin/sysinst. To generate a diff of this commit: cvs rdiff -u -r1.1076 -r1.1077 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1076 src/distrib/sets/lists/base/mi:1.1077 --- src/distrib/sets/lists/base/mi:1.1076 Wed Jul 23 02:42:56 2014 +++ src/distrib/sets/lists/base/mi Sat Jul 26 19:35:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1076 2014/07/23 02:42:56 lneto Exp $ +# $NetBSD: mi,v 1.1077 2014/07/26 19:35:59 dholland Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1565,6 +1565,7 @@ ./usr/sbin/supscanbase-sup-bin ./usr/sbin/sushibase-obsolete obsolete ./usr/sbin/sysconfdbase-obsolete obsolete +./usr/sbin/sysinstbase-sysutil-bin ./usr/sbin/sysctlbase-obsolete obsolete ./usr/sbin/syslogdbase-sysutil-bin ./usr/sbin/tbrconfigbase-obsolete obsolete
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: dholland
Date: Sat Jul 26 19:56:30 UTC 2014
Modified Files:
src/usr.sbin/sysinst: Makefile
Added Files:
src/usr.sbin/sysinst/arch/dummy: Makefile md.c md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Add a dummy sysinst architecture for ports that don't have their own yet.
This makes the presence of sysinst in /usr/sbin MI (as intended) --
remember that one of the goals is for sysinst to be able to install
chroots, and installing a chroot is a sensible operation on all ports,
even those for which an installer per se might not make sense.
Currently this dummy architecture fails instead of doing anything, but
as they say, one thing at a time.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/sysinst/arch/dummy/Makefile \
src/usr.sbin/sysinst/arch/dummy/md.c src/usr.sbin/sysinst/arch/dummy/md.h \
src/usr.sbin/sysinst/arch/dummy/msg.md.de \
src/usr.sbin/sysinst/arch/dummy/msg.md.en \
src/usr.sbin/sysinst/arch/dummy/msg.md.es \
src/usr.sbin/sysinst/arch/dummy/msg.md.fr \
src/usr.sbin/sysinst/arch/dummy/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile
diff -u src/usr.sbin/sysinst/Makefile:1.1 src/usr.sbin/sysinst/Makefile:1.2
--- src/usr.sbin/sysinst/Makefile:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/Makefile Sat Jul 26 19:56:30 2014
@@ -1,9 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:44 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/26 19:56:30 dholland Exp $
#
# sysinst is usually built when the crunched install binary is built,
# but can be built here as a normal program for testing.
-SUBDIR = arch/${MACHINE}
+.if exists(arch/${MACHINE})
+SUBDIR+=arch/${MACHINE}
+.else
+SUBDIR+=arch/dummy
+.endif
+
.if ALL_MACHINES
@@ -49,6 +54,13 @@ SUBDIR += arch/x68k
SUBDIR += arch/zaurus
# XXX notyet SUBDIR += arch/iyonix
+
+# These dirs are present in sys/arch but not here:
+#amigappc cesfic dreamcast epoc32 evbsh3 ia64 ibmnws iyonix luna68k
+#mmeye mvmeppc netwinder next68k rs6000 sbmips sun2 sun3
+# (also evbsh5, but it doesn't really exist)
+SUBDIR += arch/dummy
+
.endif
install:
Added files:
Index: src/usr.sbin/sysinst/arch/dummy/Makefile
diff -u /dev/null src/usr.sbin/sysinst/arch/dummy/Makefile:1.1
--- /dev/null Sat Jul 26 19:56:30 2014
+++ src/usr.sbin/sysinst/arch/dummy/Makefile Sat Jul 26 19:56:30 2014
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2014/07/26 19:56:30 dholland Exp $
+#
+# Makefile for dummy architecture
+#
+
+MENUS_MD=
+
+.include ../../Makefile.inc
Index: src/usr.sbin/sysinst/arch/dummy/md.c
diff -u /dev/null src/usr.sbin/sysinst/arch/dummy/md.c:1.1
--- /dev/null Sat Jul 26 19:56:30 2014
+++ src/usr.sbin/sysinst/arch/dummy/md.c Sat Jul 26 19:56:30 2014
@@ -0,0 +1,115 @@
+/* $NetBSD: md.c,v 1.1 2014/07/26 19:56:30 dholland Exp $ */
+
+/*
+ * Copyright 1997 Piermont Information Systems Inc.
+ * All rights reserved.
+ *
+ * Based on code written by Philip A. Nelson for Piermont Information
+ * Systems Inc.
+ *
+ * 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.
+ * 3. The name of Piermont Information Systems Inc. may not be used to endorse
+ *or promote products derived from this software without specific prior
+ *written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``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 PIERMONT INFORMATION SYSTEMS INC. 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 err.h
+
+#include defs.h
+#include md.h
+
+void
+md_init(void)
+{
+ errx(1, sysinst has not been properly ported to this platform);
+}
+
+void
+md_init_set_status(int flags)
+{
+ (void)flags;
+}
+
+int
+md_get_info(void)
+{
+ return 1;
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Jul 26 20:04:05 UTC 2014 Modified Files: src/share/man/man4: lua.4 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/lua.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/lua.4 diff -u src/share/man/man4/lua.4:1.4 src/share/man/man4/lua.4:1.5 --- src/share/man/man4/lua.4:1.4 Fri Jul 25 16:37:44 2014 +++ src/share/man/man4/lua.4 Sat Jul 26 20:04:05 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: lua.4,v 1.4 2014/07/25 16:37:44 apb Exp $ +.\ $NetBSD: lua.4,v 1.5 2014/07/26 20:04:05 wiz Exp $ .\ .\ Copyright (c) 2013 Marc Balmer m...@msys.ch .\ @@ -180,11 +180,6 @@ Lua device file. .Sh SEE ALSO .Xr ioctl 2 , .Xr luactl 8 -.Sh CAVEATS -The -.Nm -device is experimental. -Incompatible changes might be made in the future. .Sh HISTORY The .Nm @@ -196,3 +191,8 @@ The .Nm driver was written by .An Marc Balmer Aq Mt mbal...@netbsd.org . +.Sh CAVEATS +The +.Nm +device is experimental. +Incompatible changes might be made in the future.
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: dholland
Date: Sat Jul 26 20:24:33 UTC 2014
Modified Files:
src/sys/arch/hppa/dev: pdc.c
Log Message:
Add d_discard to a cdevsw I apparently missed.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/dev/pdc.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/hppa/dev/pdc.c
diff -u src/sys/arch/hppa/dev/pdc.c:1.1 src/sys/arch/hppa/dev/pdc.c:1.2
--- src/sys/arch/hppa/dev/pdc.c:1.1 Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/dev/pdc.c Sat Jul 26 20:24:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */
+/* $NetBSD: pdc.c,v 1.2 2014/07/26 20:24:33 dholland Exp $ */
/* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.1 2014/02/24 07:23:42 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.2 2014/07/26 20:24:33 dholland Exp $);
#include sys/param.h
#include sys/systm.h
@@ -88,8 +88,18 @@ dev_type_tty(pdctty);
dev_type_poll(pdcpoll);
const struct cdevsw pdc_cdevsw = {
- pdcopen, pdcclose, pdcread, pdcwrite, pdcioctl,
- pdcstop, pdctty, pdcpoll, nommap, ttykqfilter, D_TTY
+ .d_open = pdcopen,
+ .d_close = pdcclose,
+ .d_read = pdcread,
+ .d_write = pdcwrite,
+ .d_ioctl = pdcioctl,
+ .d_stop = pdcstop,
+ .d_tty = pdctty,
+ .d_poll = pdcpoll,
+ .d_mmap = nommap,
+ .d_kpqfilter = ttykqfilter,
+ .d_discard = nodiscard,
+ .d_flag = D_TTY
};
void pdcstart(struct tty *);
CVS commit: src/sys/external/bsd/sljit/sljit
Module Name:src Committed By: alnsn Date: Sat Jul 26 21:07:45 UTC 2014 Modified Files: src/sys/external/bsd/sljit/sljit: sljit_mod.c Log Message: Don't destroy mutexes because the module can't be unload. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/sljit/sljit/sljit_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/external/bsd/sljit/sljit/sljit_mod.c diff -u src/sys/external/bsd/sljit/sljit/sljit_mod.c:1.2 src/sys/external/bsd/sljit/sljit/sljit_mod.c:1.3 --- src/sys/external/bsd/sljit/sljit/sljit_mod.c:1.2 Tue Dec 17 22:39:23 2013 +++ src/sys/external/bsd/sljit/sljit/sljit_mod.c Sat Jul 26 21:07:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sljit_mod.c,v 1.2 2013/12/17 22:39:23 alnsn Exp $ */ +/* $NetBSD: sljit_mod.c,v 1.3 2014/07/26 21:07:45 alnsn Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sljit_mod.c,v 1.2 2013/12/17 22:39:23 alnsn Exp $); +__KERNEL_RCSID(0, $NetBSD: sljit_mod.c,v 1.3 2014/07/26 21:07:45 alnsn Exp $); #include sys/param.h #include sys/kernel.h @@ -51,8 +51,6 @@ sljit_modcmd(modcmd_t cmd, void *arg) return 0; case MODULE_CMD_FINI: - mutex_destroy(sljit_global_mutex); - mutex_destroy(sljit_allocator_mutex); return EOPNOTSUPP; default:
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: riastradh Date: Sat Jul 26 21:12:43 UTC 2014 Modified Files: src/sys/external/bsd/drm2/radeon: radeon_module.c Log Message: drmkms_ttm is not split into a module (yet). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/radeon/radeon_module.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/external/bsd/drm2/radeon/radeon_module.c diff -u src/sys/external/bsd/drm2/radeon/radeon_module.c:1.1 src/sys/external/bsd/drm2/radeon/radeon_module.c:1.2 --- src/sys/external/bsd/drm2/radeon/radeon_module.c:1.1 Wed Jul 16 20:59:58 2014 +++ src/sys/external/bsd/drm2/radeon/radeon_module.c Sat Jul 26 21:12:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_module.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $ */ +/* $NetBSD: radeon_module.c,v 1.2 2014/07/26 21:12:43 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: radeon_module.c,v 1.1 2014/07/16 20:59:58 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: radeon_module.c,v 1.2 2014/07/26 21:12:43 riastradh Exp $); #include sys/types.h #include sys/module.h @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, $NetBSD: radeon_modul #include radeon_drv.h -MODULE(MODULE_CLASS_DRIVER, radeon, drmkms,drmkms_pci,drmkms_ttm); /* XXX drmkms_i2c */ +MODULE(MODULE_CLASS_DRIVER, radeon, drmkms,drmkms_pci); /* XXX drmkms_i2c, drmkms_ttm */ #ifdef _MODULE #include ioconf.c
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 21:15:45 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_drv.c radeon_ttm.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/drm: drm_drv.c drm_gem_vm.c drm_vm.c
Log Message:
Let the drm driver decide what part of what object gets mmapped.
Pass the file around too so radeon/ttm can get at it to verify access.
Add drm_gem_or_legacy_mmap_object for drivers to choose the previous
behaviour, like i915.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/drm_gem_vm.c \
src/sys/external/bsd/drm2/drm/drm_vm.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/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.5 Wed Jul 16 23:25:18 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sat Jul 26 21:15:45 2014
@@ -1049,6 +1049,8 @@ static struct drm_driver driver = {
#endif
.gem_free_object = i915_gem_free_object,
#ifdef __NetBSD__
+ /* XXX Not clear the `or legacy' part is important here. */
+ .mmap_object = drm_gem_or_legacy_mmap_object,
.gem_uvm_ops = i915_gem_uvm_ops,
#else
.gem_vm_ops = i915_gem_vm_ops,
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c:1.3 Thu Jul 17 15:09:00 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c Sat Jul 26 21:15:45 2014
@@ -119,7 +119,10 @@ extern int radeon_get_crtc_scanoutpos(st
extern bool radeon_is_px(struct drm_device *dev);
extern const struct drm_ioctl_desc radeon_ioctls_kms[];
extern int radeon_max_kms_ioctl;
-#ifndef __NetBSD__
+#ifdef __NetBSD__
+int radeon_mmap_object(struct drm_device *, off_t, size_t, vm_prot_t,
+struct uvm_object **, voff_t *, struct file *);
+#else
int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
#endif
int radeon_mode_dumb_mmap(struct drm_file *filp,
@@ -563,6 +566,7 @@ static struct drm_driver kms_driver = {
.dumb_destroy = drm_gem_dumb_destroy,
#ifdef __NetBSD__
.fops = NULL,
+ .mmap_object = radeon_mmap_object,
.gem_uvm_ops = radeon_gem_uvm_ops,
#else
.fops = radeon_driver_kms_fops,
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.3 Thu Jul 17 03:34:13 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Sat Jul 26 21:15:45 2014
@@ -879,7 +879,7 @@ radeon_mmap_object(struct drm_device *de
if (__predict_false((offset PAGE_SHIFT) DRM_FILE_PAGE_OFFSET))
return drm_mmap_object(dev, offset, size, prot, uobjp,
- uoffsetp /* , file */);
+ uoffsetp, file);
else
return ttm_bo_mmap_object(rdev-mman.bdev, offset, size, prot,
uobjp, uoffsetp, file);
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.7
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.6 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sat Jul 26 21:15:45 2014
@@ -1097,6 +1097,8 @@ struct drm_driver {
/* Driver private ops for this object */
#ifdef __NetBSD__
+ int (*mmap_object)(struct drm_device *, off_t, size_t, int,
+ struct uvm_object **, voff_t *, struct file *);
const struct uvm_pagerops *gem_uvm_ops;
#else
const struct vm_operations_struct *gem_vm_ops;
@@ -1422,7 +1424,7 @@ extern int drm_release(struct inode *ino
/* Mapping support (drm_vm.h) */
#ifdef __NetBSD__
extern int drm_mmap_object(struct drm_device *, off_t, size_t, int,
-struct uvm_object **, voff_t *);
+struct uvm_object **, voff_t *, struct file *);
extern paddr_t drm_mmap_paddr(struct drm_device *, off_t, int);
#else
extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
@@ -1775,7 +1777,9 @@ void drm_gem_private_object_init(struct
void drm_gem_pager_reference(struct uvm_object *);
void drm_gem_pager_detach(struct uvm_object *);
int
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: riastradh
Date: Sat Jul 26 21:19:45 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
Log Message:
Make sure the low bits, not the high bits, of the offset are zero!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.4 Sat Jul 26 21:15:45 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Sat Jul 26 21:19:45 2014
@@ -872,7 +872,7 @@ radeon_mmap_object(struct drm_device *de
{
struct radeon_device *rdev = dev-dev_private;
- KASSERT(0 == (offset ~(PAGE_SIZE - 1)));
+ KASSERT(0 == (offset (PAGE_SIZE - 1)));
if (__predict_false(rdev == NULL)) /* XXX How?? */
return -EINVAL;
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sat Jul 26 21:35:06 UTC 2014 Modified Files: src/sys/external/bsd/drm2/include/linux: ww_mutex.h Log Message: Don't forget to decrement the acquired count too. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/ww_mutex.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/external/bsd/drm2/include/linux/ww_mutex.h diff -u src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.2 src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.3 --- src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.2 Tue Jul 22 02:38:31 2014 +++ src/sys/external/bsd/drm2/include/linux/ww_mutex.h Sat Jul 26 21:35:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ww_mutex.h,v 1.2 2014/07/22 02:38:31 riastradh Exp $ */ +/* $NetBSD: ww_mutex.h,v 1.3 2014/07/26 21:35:06 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -622,6 +622,8 @@ ww_mutex_unlock(struct ww_mutex *mutex) mutex-wwm_state = WW_UNLOCKED; break; case WW_CTX: + KASSERT(mutex-wwm_u.ctx != NULL); + mutex-wwm_u.ctx-wwx_acquired--; mutex-wwm_u.ctx = NULL; /* * If there are any waiters with contexts, grant the
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Sat Jul 26 21:36:40 UTC 2014 Modified Files: src/sys/external/bsd/drm2/include/linux: ww_mutex.h Log Message: Break overlong lines. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/ww_mutex.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/external/bsd/drm2/include/linux/ww_mutex.h diff -u src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.3 src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.4 --- src/sys/external/bsd/drm2/include/linux/ww_mutex.h:1.3 Sat Jul 26 21:35:06 2014 +++ src/sys/external/bsd/drm2/include/linux/ww_mutex.h Sat Jul 26 21:36:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ww_mutex.h,v 1.3 2014/07/26 21:35:06 riastradh Exp $ */ +/* $NetBSD: ww_mutex.h,v 1.4 2014/07/26 21:36:40 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -234,7 +234,8 @@ ww_mutex_lock_wait(struct ww_mutex *mute ctx-wwx_class, mutex-wwm_u.ctx-wwx_class); KASSERTMSG((mutex-wwm_u.ctx-wwx_ticket != ctx-wwx_ticket), ticket number reused: %PRId64 (%p) %PRId64 (%p), - ctx-wwx_ticket, ctx, mutex-wwm_u.ctx-wwx_ticket, mutex-wwm_u.ctx); + ctx-wwx_ticket, ctx, + mutex-wwm_u.ctx-wwx_ticket, mutex-wwm_u.ctx); collision = rb_tree_insert_node(mutex-wwm_waiters, ctx); KASSERTMSG((collision == ctx), @@ -261,7 +262,8 @@ ww_mutex_lock_wait_sig(struct ww_mutex * ctx-wwx_class, mutex-wwm_u.ctx-wwx_class); KASSERTMSG((mutex-wwm_u.ctx-wwx_ticket != ctx-wwx_ticket), ticket number reused: %PRId64 (%p) %PRId64 (%p), - ctx-wwx_ticket, ctx, mutex-wwm_u.ctx-wwx_ticket, mutex-wwm_u.ctx); + ctx-wwx_ticket, ctx, + mutex-wwm_u.ctx-wwx_ticket, mutex-wwm_u.ctx); collision = rb_tree_insert_node(mutex-wwm_waiters, ctx); KASSERTMSG((collision == ctx),
CVS commit: src/sys/netinet6
Module Name:src Committed By: joerg Date: Sat Jul 26 22:21:16 UTC 2014 Modified Files: src/sys/netinet6: mld6.c Log Message: PR 49036: net.inet6 has not been created when the sysctl constructor for net.inet6.multicast is run. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/netinet6/mld6.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/netinet6/mld6.c diff -u src/sys/netinet6/mld6.c:1.58 src/sys/netinet6/mld6.c:1.59 --- src/sys/netinet6/mld6.c:1.58 Fri Jul 25 07:12:55 2014 +++ src/sys/netinet6/mld6.c Sat Jul 26 22:21:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mld6.c,v 1.58 2014/07/25 07:12:55 ozaki-r Exp $ */ +/* $NetBSD: mld6.c,v 1.59 2014/07/26 22:21:16 joerg Exp $ */ /* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */ /* @@ -102,7 +102,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mld6.c,v 1.58 2014/07/25 07:12:55 ozaki-r Exp $); +__KERNEL_RCSID(0, $NetBSD: mld6.c,v 1.59 2014/07/26 22:21:16 joerg Exp $); #include opt_inet.h @@ -1028,6 +1028,12 @@ SYSCTL_SETUP(sysctl_in6_mklude_setup, s sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, + CTLTYPE_NODE, inet6, NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET6, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, CTLTYPE_NODE, multicast, SYSCTL_DESCR(Multicast information), in6_multicast_sysctl, 0, NULL, 0,
CVS commit: src/sys/external/bsd/drm2/dist/drm/ttm
Module Name:src Committed By: riastradh Date: Sun Jul 27 00:40:40 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c ttm_tt.c Log Message: Revert ttm_bo.c 1.3 and try to fix the double-free properly. bo-destroy doesn't ttm_tt_destroy or ttm_tt_fini anything. Trouble is that ttm_tt_fini expects the swap storage to still be there, and ttm_tt_destroy -- which is what calls ttm_tt_fini by way of ttm-func-destroy -- has already nulled it out. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.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/external/bsd/drm2/dist/drm/ttm/ttm_bo.c diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.3 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.3 Sat Jul 26 06:34:12 2014 +++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Sun Jul 27 00:40:39 2014 @@ -159,7 +159,7 @@ static void ttm_bo_release_list(struct k BUG_ON(!list_empty(bo-lru)); BUG_ON(!list_empty(bo-ddestroy)); - if (bo-destroy == NULL bo-ttm) + if (bo-ttm) ttm_tt_destroy(bo-ttm); atomic_dec(bo-glob-bo_count); if (bo-resv == bo-ttm_resv) Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.5 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c:1.5 Sat Jul 26 12:27:57 2014 +++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c Sun Jul 27 00:40:39 2014 @@ -185,9 +185,9 @@ void ttm_tt_destroy(struct ttm_tt *ttm) if (!(ttm-page_flags TTM_PAGE_FLAG_PERSISTENT_SWAP) ttm-swap_storage) fput(ttm-swap_storage); -#endif ttm-swap_storage = NULL; +#endif ttm-func-destroy(ttm); }
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: dholland
Date: Sun Jul 27 02:56:09 UTC 2014
Modified Files:
src/sys/arch/hppa/dev: pdc.c
Log Message:
Fix typo in previous. Eesh.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/pdc.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/hppa/dev/pdc.c
diff -u src/sys/arch/hppa/dev/pdc.c:1.2 src/sys/arch/hppa/dev/pdc.c:1.3
--- src/sys/arch/hppa/dev/pdc.c:1.2 Sat Jul 26 20:24:33 2014
+++ src/sys/arch/hppa/dev/pdc.c Sun Jul 27 02:56:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.2 2014/07/26 20:24:33 dholland Exp $ */
+/* $NetBSD: pdc.c,v 1.3 2014/07/27 02:56:09 dholland Exp $ */
/* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.2 2014/07/26 20:24:33 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.3 2014/07/27 02:56:09 dholland Exp $);
#include sys/param.h
#include sys/systm.h
@@ -97,7 +97,7 @@ const struct cdevsw pdc_cdevsw = {
.d_tty = pdctty,
.d_poll = pdcpoll,
.d_mmap = nommap,
- .d_kpqfilter = ttykqfilter,
+ .d_kqfilter = ttykqfilter,
.d_discard = nodiscard,
.d_flag = D_TTY
};
CVS commit: src/sys/arch
Module Name:src Committed By: dholland Date: Sun Jul 27 03:34:41 UTC 2014 Modified Files: src/sys/arch/acorn32/conf: LOWMEM_WSCONS NC src/sys/arch/cats/conf: INSTALL src/sys/arch/evbarm/conf: ADI_BRH ARMADAXP ARMADILLO210 ARMADILLO9 BCM5301X BCM56340 BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE CP3100 CUBIEBOARD DNS323 GEMINI GEMINI_MASTER GEMINI_SLAVE GOLDENGATE GUMSTIX HAWK HDL_G HPT5325 IGEPV2 IMX31LITE IQ31244 IQ80310 IQ80321 IXDP425 IXM1200 KOBO KUROBOX_PRO LUBBOCK N900 NAPPI NETWALKER NSLU2 ODROID ODROID-U OMAP5EVM OPENBLOCKS_A6 OPENBLOCKS_AX3 OSK5912 OVERO PANDABOARD RPI SHEEVAPLUG TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL VIPER ZAO425 src/sys/arch/shark/conf: OFWGENCFG Log Message: internally consistency checks - internal consistency checks To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/acorn32/conf/LOWMEM_WSCONS cvs rdiff -u -r1.62 -r1.63 src/sys/arch/acorn32/conf/NC cvs rdiff -u -r1.92 -r1.93 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/ADI_BRH \ src/sys/arch/evbarm/conf/IQ31244 cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/ARMADAXP \ src/sys/arch/evbarm/conf/CUBIEBOARD cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/ARMADILLO9 \ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/BCM56340 \ src/sys/arch/evbarm/conf/OMAP5EVM cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/BEAGLEBOARD \ src/sys/arch/evbarm/conf/ZAO425 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/BEAGLEBOARDXM cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/BEAGLEBONE \ src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/CP3100 \ src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/DNS323 \ src/sys/arch/evbarm/conf/GOLDENGATE src/sys/arch/evbarm/conf/KUROBOX_PRO cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/GEMINI \ src/sys/arch/evbarm/conf/GEMINI_MASTER \ src/sys/arch/evbarm/conf/GEMINI_SLAVE cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/conf/GUMSTIX \ src/sys/arch/evbarm/conf/IQ80321 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/HAWK \ src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/HPT5325 \ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/IGEPV2 cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/IMX31LITE cvs rdiff -u -r1.82 -r1.83 src/sys/arch/evbarm/conf/IQ80310 \ src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/IXDP425 \ src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/conf/IXM1200 cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/LUBBOCK cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/NAPPI cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/NETWALKER \ src/sys/arch/evbarm/conf/TISDP2420 src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/NSLU2 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ODROID cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ODROID-U \ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/OVERO cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/PANDABOARD cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/VIPER cvs rdiff -u -r1.42 -r1.43 src/sys/arch/shark/conf/OFWGENCFG 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/acorn32/conf/LOWMEM_WSCONS diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.64 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.65 --- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.64 Sun Jun 30 21:38:55 2013 +++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Sun Jul 27 03:34:41 2014 @@ -1,4 +1,4 @@ -# $NetBSD: LOWMEM_WSCONS,v 1.64 2013/06/30 21:38:55 rmind Exp $ +# $NetBSD: LOWMEM_WSCONS,v 1.65 2014/07/27 03:34:41 dholland Exp $ # # LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines # @@ -110,7 +110,7 @@ options USERCONF # userconf(4) support #options ARM700BUGTRACK # track the ARM700 swi bug #options PORTMASTER # Enable PortMaster only options -#options DIAGNOSTIC # internally consistency checks +#options DIAGNOSTIC # internal consistency checks #options PMAP_DEBUG # Enable pmap_debug_level code #options DDB # in-kernel debugger #options DDB_HISTORY_SIZE=100 # Enable history
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: dholland
Date: Sun Jul 27 03:49:25 UTC 2014
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_scatter.c
Log Message:
Fix misplaced parenthesis, from Henning Petersen in PR 44804.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.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/external/bsd/drm/dist/bsd-core/drm_scatter.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c:1.3 Sat Jun 20 01:07:09 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c Sun Jul 27 03:49:25 2014
@@ -129,7 +129,7 @@ drm_sg_alloc(struct drm_device *dev, str
if ((ret = bus_dmamem_alloc(dmah-tag, request-size, PAGE_SIZE, 0,
dmah-segs, pages, nsegs,
-BUS_DMA_WAITOK) != 0)) {
+BUS_DMA_WAITOK)) != 0) {
printf(drm: Unable to allocate %lu bytes of DMA, error %d\n,
request-size, ret);
dmah-tag = NULL;
CVS commit: src/external/gpl3
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:16:09 UTC 2014
Modified Files:
src/external/gpl3/gcc.old/usr.bin: Makefile.inc
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
Update the bug report URL as per PR 48712. I assume in order for this
to propagate to where it'll be seen we need to rerun mknative, which
I'm not in a position to do right now; but this way it'll update the
next time someone else does that.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc.old/usr.bin/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/usr.bin/Makefile.inc
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/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.1.1.2 src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.2
--- src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.1.1.2 Wed Feb 26 10:57:34 2014
+++ src/external/gpl3/gcc.old/usr.bin/Makefile.inc Sun Jul 27 04:16:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1.1.2 2014/02/26 10:57:34 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/07/27 04:16:09 dholland Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -66,7 +66,7 @@ DATESTAMPSTR= \\
.endif
# XXX pull this out of our configs
-G_BUGURL=http://www.NetBSD.org/Misc/send-pr.html
+G_BUGURL=http://www.NetBSD.org/support/send-pr.html
G_BUGURL_s=\${G_BUG_URL}\
G_PKGVERSION=(NetBSD nb1 20120916)
G_PKGVERSION_s=\${G_PKGVERSION} \
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.24 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.25
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.24 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sun Jul 27 04:16:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.24 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.25 2014/07/27 04:16:09 dholland Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -68,7 +68,7 @@ DATESTAMPSTR= \\
.include ${TOP}/tools/gcc/gcc-version.mk
# XXX pull this out of our configs
-G_BUGURL=http://www.NetBSD.org/Misc/send-pr.html
+G_BUGURL=http://www.NetBSD.org/support/send-pr.html
G_BUGURL_s=\${G_BUGURL}\
G_PKGVERSION=(${NETBSD_GCC_VERSION})
G_PKGVERSION_s=\${G_PKGVERSION} \
CVS commit: src/sbin/veriexecctl
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:23:44 UTC 2014
Modified Files:
src/sbin/veriexecctl: veriexecctl.c
Log Message:
Fix snprintf usage and, while here, don't trundle off the end of an
array. Part of PR 47976 from Henning Petersen.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sbin/veriexecctl/veriexecctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/veriexecctl/veriexecctl.c
diff -u src/sbin/veriexecctl/veriexecctl.c:1.36 src/sbin/veriexecctl/veriexecctl.c:1.37
--- src/sbin/veriexecctl/veriexecctl.c:1.36 Sun Feb 9 13:40:59 2014
+++ src/sbin/veriexecctl/veriexecctl.c Sun Jul 27 04:23:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: veriexecctl.c,v 1.36 2014/02/09 13:40:59 maxv Exp $ */
+/* $NetBSD: veriexecctl.c,v 1.37 2014/07/27 04:23:44 dholland Exp $ */
/*-
* Copyright 2005 Elad Efrat e...@netbsd.org
@@ -181,11 +181,11 @@ print_entry(prop_dictionary_t entry)
/* Get fingerprint in ASCII. */
len = prop_data_size(prop_dictionary_get(entry, fp));
- len *= 2;
- fp = calloc(1, len + 1);
+ fp = calloc(1, len*2 + 1);
v = dict_getd(entry, fp);
- for (i = 0; i len; i++)
- snprintf(fp, len + 1, %s%02x, fp, v[i] 0xff);
+ for (i = 0; i len; i++) {
+ snprintf(fp[i*2], 3, %02x, v[i] 0xff);
+ }
/* Get flags. */
memset(flags, 0, sizeof(flags));
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:26:23 UTC 2014
Modified Files:
src/usr.bin/netstat: show.c
Log Message:
Fix snprintf usage; from Henning Petersen in PR 47976.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/netstat/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/show.c
diff -u src/usr.bin/netstat/show.c:1.19 src/usr.bin/netstat/show.c:1.20
--- src/usr.bin/netstat/show.c:1.19 Mon Apr 28 15:41:15 2014
+++ src/usr.bin/netstat/show.c Sun Jul 27 04:26:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.19 2014/04/28 15:41:15 christos Exp $ */
+/* $NetBSD: show.c,v 1.20 2014/07/27 04:26:23 dholland Exp $ */
/* $OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $ */
/*
@@ -705,6 +705,7 @@ char *
mpls_ntoa(const struct sockaddr *sa)
{
static char obuf[16];
+ size_t olen;
const union mpls_shim *pms;
union mpls_shim ms;
int psize = sizeof(struct sockaddr_mpls);
@@ -717,7 +718,8 @@ mpls_ntoa(const struct sockaddr *sa)
while(psize sa-sa_len) {
pms++;
ms.s_addr = ntohl(pms-s_addr);
- snprintf(obuf, sizeof(obuf), %s,%u, obuf,
+ olen = strlen(obuf);
+ snprintf(obuf + olen, sizeof(obuf) - olen, ,%u,
ms.shim.label);
psize+=sizeof(ms);
}
CVS commit: src/usr.bin/tip
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:32:23 UTC 2014
Modified Files:
src/usr.bin/tip: cu.c tip.c
Log Message:
Remove broken snprintf usage (noted in PR 47976) and replace with
something simpler.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/tip/cu.c
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/tip/tip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tip/cu.c
diff -u src/usr.bin/tip/cu.c:1.21 src/usr.bin/tip/cu.c:1.22
--- src/usr.bin/tip/cu.c:1.21 Tue Sep 6 18:33:01 2011
+++ src/usr.bin/tip/cu.c Sun Jul 27 04:32:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $ */
+/* $NetBSD: cu.c,v 1.22 2014/07/27 04:32:23 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = @(#)cu.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $);
+__RCSID($NetBSD: cu.c,v 1.22 2014/07/27 04:32:23 dholland Exp $);
#endif /* not lint */
#include tip.h
@@ -55,7 +55,8 @@ cumain(int argc, char *argv[])
int flow = -1; /* -1 is tandem ^S/^Q */
static int helpme = 0, nostop = 0;
char useresc = '~';
- static char sbuf[12], brbuf[16];
+ static char sbuf[12];
+ int cmdlineBR;
extern char *optarg;
extern int optind;
@@ -80,6 +81,7 @@ cumain(int argc, char *argv[])
CU = NULL;
DV = NULL;
BR = DEFBR;
+ cmdlineBR = 0;
while((c = getopt_long(argc, argv,
E:F:P:a:p:c:l:s:hefot0123456789, longopts, NULL)) != -1) {
@@ -159,9 +161,8 @@ cumain(int argc, char *argv[])
break;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- (void)snprintf(brbuf, sizeof(brbuf) -1, %s%c,
- brbuf, c);
- BR = atoi(brbuf);
+ cmdlineBR = cmdlineBR * 10 + (c - '0');
+ BR = cmdlineBR;
break;
default:
if (nostop == 0)
Index: src/usr.bin/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.54 src/usr.bin/tip/tip.c:1.55
--- src/usr.bin/tip/tip.c:1.54 Sat Jul 12 05:28:07 2014
+++ src/usr.bin/tip/tip.c Sun Jul 27 04:32:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.54 2014/07/12 05:28:07 mlelstv Exp $ */
+/* $NetBSD: tip.c,v 1.55 2014/07/27 04:32:23 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tip.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: tip.c,v 1.54 2014/07/12 05:28:07 mlelstv Exp $);
+__RCSID($NetBSD: tip.c,v 1.55 2014/07/27 04:32:23 dholland Exp $);
#endif /* not lint */
/*
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
char *p;
const char *q;
char sbuf[12];
- static char brbuf[16];
+ int cmdlineBR;
int fcarg;
setprogname(argv[0]);
@@ -95,6 +95,7 @@ main(int argc, char *argv[])
exit(1);
}
+ cmdlineBR = 0;
while((c = getopt(argc, argv, v0123456789)) != -1) {
switch(c) {
@@ -104,8 +105,8 @@ main(int argc, char *argv[])
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- (void)snprintf(brbuf, sizeof(brbuf) -1, %s%c, brbuf, c);
- BR = atoi(brbuf);
+ cmdlineBR = cmdlineBR * 10 + (c - '0');
+ BR = cmdlineBR;
break;
default:
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:38:03 UTC 2014
Modified Files:
src/usr.sbin/mopd/common: Makefile log.c
Log Message:
Fix broken snprintf usage; noted in PR 47976 from Henning Petersen.
As a bonus, this removes the nonliteral format arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mopd/common/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.19 src/usr.sbin/mopd/common/Makefile:1.20
--- src/usr.sbin/mopd/common/Makefile:1.19 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/mopd/common/Makefile Sun Jul 27 04:38:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2014/07/27 04:38:03 dholland Exp $
LIBISPRIVATE= yes
@@ -21,4 +21,3 @@ version.c: VERSION
.include bsd.lib.mk
COPTS.print.c+= -Wno-pointer-sign
-COPTS.log.c+= -Wno-format-nonliteral
Index: src/usr.sbin/mopd/common/log.c
diff -u src/usr.sbin/mopd/common/log.c:1.2 src/usr.sbin/mopd/common/log.c:1.3
--- src/usr.sbin/mopd/common/log.c:1.2 Mon Apr 28 20:24:17 2008
+++ src/usr.sbin/mopd/common/log.c Sun Jul 27 04:38:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $ */
+/* $NetBSD: log.c,v 1.3 2014/07/27 04:38:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $);
+__RCSID($NetBSD: log.c,v 1.3 2014/07/27 04:38:03 dholland Exp $);
#endif
#include err.h
@@ -47,13 +47,15 @@ mopLogErr(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
verr(1, fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_ERR, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_ERR, %s: %s, buf, strerror(error));
}
va_end(ap);
exit(1);
@@ -64,13 +66,15 @@ mopLogWarn(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
vwarn(fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_WARNING, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_WARNING, %s: %s, buf, strerror(error));
}
va_end(ap);
}
CVS commit: src/usr.sbin/schedctl
Module Name:src
Committed By: dholland
Date: Sun Jul 27 04:46:48 UTC 2014
Modified Files:
src/usr.sbin/schedctl: schedctl.c
Log Message:
Fix illegal snprintf usage noted in PR 47976 by simplifying it away:
instead of consing up a string and printing it to stdout, just print
to stdout. Not as compositionally tidy, but much simpler and perfectly
adequate here.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/schedctl/schedctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/schedctl/schedctl.c
diff -u src/usr.sbin/schedctl/schedctl.c:1.15 src/usr.sbin/schedctl/schedctl.c:1.16
--- src/usr.sbin/schedctl/schedctl.c:1.15 Wed Aug 31 13:32:41 2011
+++ src/usr.sbin/schedctl/schedctl.c Sun Jul 27 04:46:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: schedctl.c,v 1.15 2011/08/31 13:32:41 joerg Exp $ */
+/* $NetBSD: schedctl.c,v 1.16 2014/07/27 04:46:48 dholland Exp $ */
/*
* Copyright (c) 2008, Mindaugas Rasiukevicius rmind at NetBSD org
@@ -33,9 +33,10 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: schedctl.c,v 1.15 2011/08/31 13:32:41 joerg Exp $);
+__RCSID($NetBSD: schedctl.c,v 1.16 2014/07/27 04:46:48 dholland Exp $);
#endif
+#include stdbool.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -60,7 +61,7 @@ static const char *class_str[] = {
static void sched_set(pid_t, lwpid_t, int, struct sched_param *, cpuset_t *);
static void thread_info(pid_t, lwpid_t);
static cpuset_t *makecpuset(char *);
-static char *showcpuset(cpuset_t *);
+static void printcpuset(cpuset_t *);
__dead static void usage(void);
static u_int ncpu;
@@ -205,7 +206,6 @@ thread_info(pid_t pid, lwpid_t lid)
{
struct sched_param sp;
cpuset_t *cpuset;
- char *cpus;
int error, policy;
cpuset = cpuset_create();
@@ -224,9 +224,9 @@ thread_info(pid_t pid, lwpid_t lid)
printf( Priority: %d\n, sp.sched_priority);
printf( Class:%s\n, class_str[policy]);
- cpus = showcpuset(cpuset);
- printf( Affinity (CPUs): %s\n, cpus);
- free(cpus);
+ printf( Affinity (CPUs): );
+ printcpuset(cpuset);
+ printf(\n);
cpuset_destroy(cpuset);
}
@@ -280,31 +280,26 @@ makecpuset(char *str)
return cpuset;
}
-static char *
-showcpuset(cpuset_t *cpuset)
+static void
+printcpuset(cpuset_t *cpuset)
{
- char *buf;
- size_t size;
unsigned int i;
+ bool seen;
- size = 3 * ncpu; /* XXX */
- buf = malloc(size + 1);
- if (buf == NULL)
- err(EXIT_FAILURE, malloc);
- memset(buf, '\0', size + 1);
-
- for (i = 0; i ncpu; i++)
- if (cpuset_isset(i, cpuset))
- snprintf(buf, size, %s%d,, buf, i);
-
- i = strlen(buf);
- if (i != 0) {
- buf[i - 1] = '\0';
- } else {
- strncpy(buf, none, size);
+ seen = false;
+ for (i = 0; i ncpu; i++) {
+ if (cpuset_isset(i, cpuset)) {
+ if (seen) {
+putchar(',');
+ }
+ printf(%d, i);
+ seen = true;
+ }
}
- return buf;
+ if (!seen) {
+ printf(none);
+ }
}
static void
