CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Mon Oct 21 06:33:11 UTC 2013
Modified Files:
src/sys/arch/x86/x86: identcpu.c
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Check cpuid leaf 4 for newer Intel CPU to know the cache information.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.34 src/sys/arch/x86/x86/identcpu.c:1.35
--- src/sys/arch/x86/x86/identcpu.c:1.34 Thu Jun 27 00:38:18 2013
+++ src/sys/arch/x86/x86/identcpu.c Mon Oct 21 06:33:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.34 2013/06/27 00:38:18 christos Exp $ */
+/* $NetBSD: identcpu.c,v 1.35 2013/10/21 06:33:11 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.34 2013/06/27 00:38:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.35 2013/10/21 06:33:11 msaitoh Exp $");
#include "opt_xen.h"
@@ -678,7 +678,7 @@ cpu_probe(struct cpu_info *ci)
}
if (cpuid_level >= 2) {
- /* Parse the cache info from `cpuid', if we have it. */
+ /* Parse the cache info from `cpuid leaf 2', if we have it. */
x86_cpuid(2, descs);
iterations = descs[0] & 0xff;
while (iterations-- > 0) {
@@ -702,6 +702,60 @@ cpu_probe(struct cpu_info *ci)
}
}
+ if (cpuid_level >= 4) {
+ int type, level;
+ int ways, partitions, linesize, sets;
+ int caitype = -1;
+ int totalsize;
+
+ /* Parse the cache info from `cpuid leaf 4', if we have it. */
+ for (i = 0; ; i++) {
+ x86_cpuid2(4, i, descs);
+ type = __SHIFTOUT(descs[0], CPUID_DCP_CACHETYPE);
+ if (type == CPUID_DCP_CACHETYPE_N)
+break;
+ level = __SHIFTOUT(descs[0], CPUID_DCP_CACHELEVEL);
+ switch (level) {
+ case 1:
+if (type == CPUID_DCP_CACHETYPE_I)
+ caitype = CAI_ICACHE;
+else if (type == CPUID_DCP_CACHETYPE_D)
+ caitype = CAI_DCACHE;
+else
+ caitype = -1;
+break;
+ case 2:
+if (type == CPUID_DCP_CACHETYPE_U)
+ caitype = CAI_L2CACHE;
+else
+ caitype = -1;
+break;
+ case 3:
+if (type == CPUID_DCP_CACHETYPE_U)
+ caitype = CAI_L3CACHE;
+else
+ caitype = -1;
+break;
+ default:
+caitype = -1;
+break;
+ }
+ if (caitype == -1)
+continue;
+
+ ways = __SHIFTOUT(descs[1], CPUID_DCP_WAYS) + 1;
+ partitions =__SHIFTOUT(descs[1], CPUID_DCP_PARTITIONS)
+ + 1;
+ linesize = __SHIFTOUT(descs[1], CPUID_DCP_LINESIZE)
+ + 1;
+ sets = descs[2] + 1;
+ totalsize = ways * partitions * linesize * sets;
+ ci->ci_cinfo[caitype].cai_totalsize = totalsize;
+ ci->ci_cinfo[caitype].cai_associativity = ways;
+ ci->ci_cinfo[caitype].cai_linesize = linesize;
+ }
+ }
+
cpu_probe_k5(ci);
cpu_probe_k678(ci);
cpu_probe_cyrix(ci);
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.44 src/usr.sbin/cpuctl/arch/i386.c:1.45
--- src/usr.sbin/cpuctl/arch/i386.c:1.44 Mon Oct 21 06:28:15 2013
+++ src/usr.sbin/cpuctl/arch/i386.c Mon Oct 21 06:33:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.44 2013/10/21 06:28:15 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.45 2013/10/21 06:33:11 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.44 2013/10/21 06:28:15 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.45 2013/10/21 06:33:11 msaitoh Exp $");
#endif /* not lint */
#include
@@ -1306,6 +1306,10 @@ cpu_probe_base_features(struct cpu_info
const struct x86_cache_info *cai;
u_int descs[4];
int iterations, i, j;
+ int type, level;
+ int ways, partitions, linesize, sets;
+ int caitype = -1;
+ int totalsize;
uint8_t desc;
uint32_t brand[12];
@@ -1362,7 +1366,7 @@ cpu_probe_base_features(struct cpu_info
return;
/*
- * Parse the cache info from `cpuid', if we have it.
+ * Parse the cache info from `cpuid leaf 2', if we have it.
* XXX This is kinda ugly, but hey, so is the architecture...
*/
@@ -1402,6 +1406,58 @@ cpu_probe_base_features(struct cpu_info
ci->ci_cpu_serial[1] = descs[3];
}
+ if (ci->ci_cpuid_level < 4)
+ return;
+
+ /* Parse the cache info from `cpuid leaf 4', if we have it. */
+ for (i = 0; ; i++) {
+ x86_cpuid2(4, i, descs);
+ type = __SHIFTOUT(descs[0], CPUID_DCP_CACHETYPE);
+ if (type == CPUID_DCP_CACHETYPE_N)
+ break;
+ level = __SHIFTOUT(descs[0], CPUID_DCP_CACHELEVEL);
+ switch (level) {
+ case 1:
+ if (type == CPUID_DCP_CACHETYPE_I)
+caitype = CAI_ICACHE;
+ else if (type == CPUID_DCP_CACHETYPE_D)
+caitype = CAI_DCACHE;
+ else
+caitype = -1;
+ break;
+ case 2:
+ i
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Mon Oct 21 06:11:49 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: - Add Intel Deterministic Cache Parameter Leaf (CPUID leaf 4). This definitions are required to know chache information of newer Intel CPU. - Fix comment. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.70 src/sys/arch/x86/include/specialreg.h:1.71 --- src/sys/arch/x86/include/specialreg.h:1.70 Fri Oct 4 17:53:19 2013 +++ src/sys/arch/x86/include/specialreg.h Mon Oct 21 06:11:49 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.70 2013/10/04 17:53:19 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.71 2013/10/21 06:11:49 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -97,7 +97,7 @@ #define CPUID_FPU 0x0001 /* processor has an FPU? */ #define CPUID_VME 0x0002 /* has virtual mode (%cr4's VME/PVI) */ #define CPUID_DE 0x0004 /* has debugging extension */ -#define CPUID_PSE 0x0008 /* has page 4MB page size extension */ +#define CPUID_PSE 0x0008 /* has 4MB page size extension */ #define CPUID_TSC 0x0010 /* has time stamp counter */ #define CPUID_MSR 0x0020 /* has mode specific registers */ #define CPUID_PAE 0x0040 /* has phys address extension */ @@ -207,6 +207,35 @@ #define CPUID2EXTMODEL(cpuid) (((cpuid) >> 16) & 0xf) /* + * Intel Deterministic Cache Parameter Leaf + * Fn_0004 + */ + +/* %eax */ +#define CPUID_DCP_CACHETYPE __BITS(4, 0) /* Cache type */ +#define CPUID_DCP_CACHETYPE_N 0 /* NULL */ +#define CPUID_DCP_CACHETYPE_D 1 /* Data cache */ +#define CPUID_DCP_CACHETYPE_I 2 /* Instruction cache */ +#define CPUID_DCP_CACHETYPE_U 3 /* Unified cache */ +#define CPUID_DCP_CACHELEVEL __BITS(7, 5) /* Cache level (start at 1) */ +#define CPUID_DCP_SELFINITCL __BIT(8) /* Self initializing cachelvl*/ +#define CPUID_DCP_FULLASSOC __BIT(9) /* Full associative */ +#define CPUID_DCP_SHAREING __BITS(25, 14) /* shareing */ +#define CPUID_DCP_CORE_P_PKG __BITS(31, 26) /* Cores/package */ + +/* %ebx */ +#define CPUID_DCP_LINESIZE __BITS(11, 0) /* System coherency linesize */ +#define CPUID_DCP_PARTITIONS __BITS(21, 12) /* Physical line partitions */ +#define CPUID_DCP_WAYS __BITS(31, 22) /* Ways of associativity */ + +/* Number of sets: %ecx */ + +/* %edx */ +#define CPUID_DCP_INVALIDATE __BIT(0) /* WB invalidate/invalidate */ +#define CPUID_DCP_INCLUSIVE __BIT(1) /* Cache inclusiveness */ +#define CPUID_DCP_COMPLEX __BIT(2) /* Complex cache indexing */ + +/* * Intel Digital Thermal Sensor and * Power Management, Fn_0006 - %eax. */
CVS commit: src/external/historical/nawk/dist
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:35:46 UTC 2013
Modified Files:
src/external/historical/nawk/dist: lib.c
Log Message:
remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/historical/nawk/dist/lib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/historical/nawk/dist/lib.c
diff -u src/external/historical/nawk/dist/lib.c:1.7 src/external/historical/nawk/dist/lib.c:1.8
--- src/external/historical/nawk/dist/lib.c:1.7 Sat Dec 29 09:51:41 2012
+++ src/external/historical/nawk/dist/lib.c Sun Oct 20 17:35:46 2013
@@ -753,10 +753,9 @@ int isclvar(const char *s) /* is s of fo
#include
int is_number(const char *s)
{
- double r;
char *ep;
errno = 0;
- r = strtod(s, &ep);
+ (void)strtod(s, &ep);
if (ep == s || errno == ERANGE)
return 0;
if (ep - s >= 3 && strncasecmp(ep - 3, "nan", 3) == 0)
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/threads
Module Name:src Committed By: christos Date: Sun Oct 20 21:18:00 UTC 2013 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c Log Message: remove unused variables To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c diff -u src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.4 src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.5 --- src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.4 Sat Jun 11 12:54:58 2011 +++ src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c Sun Oct 20 17:18:00 2013 @@ -427,7 +427,6 @@ int doit(char *ctx[4]) BIO *c_bio=NULL; BIO *s_bio=NULL; int c_r,c_w,s_r,s_w; - int c_want,s_want; int i; int done=0; int c_write,s_write; @@ -466,8 +465,6 @@ int doit(char *ctx[4]) c_r=0; s_r=1; c_w=1; s_w=0; - c_want=W_WRITE; - s_want=0; c_write=1,s_write=0; /* We can always do writes */
CVS commit: src/common/lib/libx86emu
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:16:55 UTC 2013
Modified Files:
src/common/lib/libx86emu: x86emu_i8254.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libx86emu/x86emu_i8254.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libx86emu/x86emu_i8254.c
diff -u src/common/lib/libx86emu/x86emu_i8254.c:1.1 src/common/lib/libx86emu/x86emu_i8254.c:1.2
--- src/common/lib/libx86emu/x86emu_i8254.c:1.1 Fri Dec 21 12:45:50 2007
+++ src/common/lib/libx86emu/x86emu_i8254.c Sun Oct 20 17:16:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: x86emu_i8254.c,v 1.1 2007/12/21 17:45:50 joerg Exp $ */
+/* $NetBSD: x86emu_i8254.c,v 1.2 2013/10/20 21:16:54 christos Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -109,8 +109,6 @@ x86emu_i8254_counter(struct x86emu_i8254
static bool
x86emu_i8254_out(struct x86emu_i8254_timer *timer, uint64_t curtick)
{
- uint16_t maxtick;
-
/*
* TODO:
* Mode 0:
@@ -125,12 +123,6 @@ x86emu_i8254_out(struct x86emu_i8254_tim
if (timer->gate_high || timer->start_tick > curtick)
return (timer->active_mode != 0);
- /* Max tick based on BCD/binary mode */
- if (timer->active_is_bcd)
- maxtick = ;
- else
- maxtick = 0x;
-
curtick -= timer->start_tick;
/* Return LOW until counter is 0, afterwards HIGH until reload. */
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:17:28 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: parse.y
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/crypto/dist/ipsec-tools/src/setkey/parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/parse.y
diff -u src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.15 src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.16
--- src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.15 Mon Jan 9 10:25:13 2012
+++ src/crypto/dist/ipsec-tools/src/setkey/parse.y Sun Oct 20 17:17:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.15 2012/01/09 15:25:13 drochner Exp $ */
+/* $NetBSD: parse.y,v 1.16 2013/10/20 21:17:28 christos Exp $ */
/* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */
@@ -954,7 +954,6 @@ setkeymsg_spdaddr(type, upper, policy, s
int plen;
struct sockaddr *sa;
int salen;
- struct sadb_x_policy *sp;
#ifdef HAVE_POLICY_FWD
struct sadb_x_ipsecrequest *ps = NULL;
int saved_level, saved_id = 0;
@@ -969,7 +968,6 @@ setkeymsg_spdaddr(type, upper, policy, s
setkeymsg0(msg, type, SADB_SATYPE_UNSPEC, 0);
l = sizeof(struct sadb_msg);
- sp = (struct sadb_x_policy*) (buf + l);
memcpy(buf + l, policy->buf, policy->len);
l += policy->len;
@@ -1094,11 +1092,10 @@ setkeymsg_spdaddr_tag(type, tag, policy)
{
struct sadb_msg *msg;
char buf[BUFSIZ];
- int l, l0;
+ int l;
#ifdef SADB_X_EXT_TAG
struct sadb_x_tag m_tag;
#endif
- int n;
msg = (struct sadb_msg *)buf;
@@ -1109,9 +1106,6 @@ setkeymsg_spdaddr_tag(type, tag, policy)
memcpy(buf + l, policy->buf, policy->len);
l += policy->len;
- l0 = l;
- n = 0;
-
#ifdef SADB_X_EXT_TAG
memset(&m_tag, 0, sizeof(m_tag));
m_tag.sadb_x_tag_len = PFKEY_UNIT64(sizeof(m_tag));
CVS commit: src/dist/pppd/pppd
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:16:05 UTC 2013
Modified Files:
src/dist/pppd/pppd: auth.c cbcp.c utils.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/pppd/pppd/auth.c
cvs rdiff -u -r1.3 -r1.4 src/dist/pppd/pppd/cbcp.c
cvs rdiff -u -r1.5 -r1.6 src/dist/pppd/pppd/utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pppd/pppd/auth.c
diff -u src/dist/pppd/pppd/auth.c:1.8 src/dist/pppd/pppd/auth.c:1.9
--- src/dist/pppd/pppd/auth.c:1.8 Fri Oct 7 06:42:54 2011
+++ src/dist/pppd/pppd/auth.c Sun Oct 20 17:16:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.c,v 1.8 2011/10/07 10:42:54 joerg Exp $ */
+/* $NetBSD: auth.c,v 1.9 2013/10/20 21:16:05 christos Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -75,7 +75,7 @@
#if 0
#define RCSID "Id: auth.c,v 1.112 2006/06/18 11:26:00 paulus Exp"
#else
-__RCSID("$NetBSD: auth.c,v 1.8 2011/10/07 10:42:54 joerg Exp $");
+__RCSID("$NetBSD: auth.c,v 1.9 2013/10/20 21:16:05 christos Exp $");
#endif
#endif
@@ -565,12 +565,9 @@ link_required(unit)
void start_link(unit)
int unit;
{
-char *msg;
-
new_phase(PHASE_SERIALCONN);
devfd = the_channel->connect();
-msg = "Connect script failed";
if (devfd < 0)
goto fail;
@@ -583,7 +580,6 @@ void start_link(unit)
* gives us. Thus we don't need the tdb_writelock/tdb_writeunlock.
*/
fd_ppp = the_channel->establish_ppp(devfd);
-msg = "ppp establishment failed";
if (fd_ppp < 0) {
status = EXIT_FATAL_ERROR;
goto disconnect;
Index: src/dist/pppd/pppd/cbcp.c
diff -u src/dist/pppd/pppd/cbcp.c:1.3 src/dist/pppd/pppd/cbcp.c:1.4
--- src/dist/pppd/pppd/cbcp.c:1.3 Thu Jun 29 17:50:17 2006
+++ src/dist/pppd/pppd/cbcp.c Sun Oct 20 17:16:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cbcp.c,v 1.3 2006/06/29 21:50:17 christos Exp $ */
+/* $NetBSD: cbcp.c,v 1.4 2013/10/20 21:16:05 christos Exp $ */
/*
* cbcp - Call Back Configuration Protocol.
@@ -40,7 +40,7 @@
#if 0
#define RCSID "Id: cbcp.c,v 1.17 2006/05/22 00:04:07 paulus Exp"
#else
-__RCSID("$NetBSD: cbcp.c,v 1.3 2006/06/29 21:50:17 christos Exp $");
+__RCSID("$NetBSD: cbcp.c,v 1.4 2013/10/20 21:16:05 christos Exp $");
#endif
#endif
@@ -291,6 +291,7 @@ cbcp_printpkt(p, plen, printer, arg)
char str[256];
GETCHAR(addrt, p);
+ __USE(addrt);
memcpy(str, p, olen - 4);
str[olen - 4] = 0;
printer(arg, " number = %s", str);
@@ -335,8 +336,10 @@ cbcp_recvreq(us, pckt, pcktlen)
break;
}
- if (opt_len > 2)
+ if (opt_len > 2) {
GETCHAR(delay, pckt);
+ __USE(delay);
+ }
us->us_allowed |= (1 << type);
@@ -349,6 +352,7 @@ cbcp_recvreq(us, pckt, pcktlen)
dbglog("user callback allowed");
if (opt_len > 4) {
GETCHAR(addr_type, pckt);
+ __USE(addr_type);
memcpy(address, pckt, opt_len - 4);
address[opt_len - 4] = 0;
if (address[0])
@@ -471,11 +475,14 @@ cbcp_recvack(us, pckt, len)
GETCHAR(opt_len, pckt);
if (opt_len >= 2 && opt_len <= len) {
- if (opt_len > 2)
+ if (opt_len > 2) {
GETCHAR(delay, pckt);
+ __USE(delay);
+ }
if (opt_len > 4) {
GETCHAR(addr_type, pckt);
+ __USE(addr_type);
memcpy(address, pckt, opt_len - 4);
address[opt_len - 4] = 0;
if (address[0])
Index: src/dist/pppd/pppd/utils.c
diff -u src/dist/pppd/pppd/utils.c:1.5 src/dist/pppd/pppd/utils.c:1.6
--- src/dist/pppd/pppd/utils.c:1.5 Fri Apr 2 22:08:30 2010
+++ src/dist/pppd/pppd/utils.c Sun Oct 20 17:16:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.5 2010/04/03 02:08:30 pgoyette Exp $ */
+/* $NetBSD: utils.c,v 1.6 2013/10/20 21:16:05 christos Exp $ */
/*
* utils.c - various utility functions used in pppd.
@@ -35,7 +35,7 @@
#if 0
#define RCSID "Id: utils.c,v 1.24 2004/11/04 10:02:26 paulus Exp"
#else
-__RCSID("$NetBSD: utils.c,v 1.5 2010/04/03 02:08:30 pgoyette Exp $");
+__RCSID("$NetBSD: utils.c,v 1.6 2013/10/20 21:16:05 christos Exp $");
#endif
#endif
@@ -625,10 +625,9 @@ logit(level, fmt, args)
char *fmt;
va_list args;
{
-int n;
char buf[1024];
-n = vslprintf(buf, sizeof(buf), fmt, args);
+(void)vslprintf(buf, sizeof(buf), fmt, args);
log_write(level, buf);
}
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Sun Oct 20 21:13:23 UTC 2013 Modified Files: src/sbin/gpt: gpt.8 Log Message: revert typo fix; teach me to blindly take changes from upstream To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.12 src/sbin/gpt/gpt.8:1.13 --- src/sbin/gpt/gpt.8:1.12 Sat Oct 19 01:19:03 2013 +++ src/sbin/gpt/gpt.8 Sun Oct 20 21:13:23 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: gpt.8,v 1.12 2013/10/19 01:19:03 jnemeth Exp $ +.\" $NetBSD: gpt.8,v 1.13 2013/10/20 21:13:23 jnemeth Exp $ .\" .\" Copyright (c) 2002 Marcel Moolenaar .\" All rights reserved. @@ -68,7 +68,7 @@ have an effect on all commands. The .Fl p Ar count option allows the user to change the number of partitions the GPT can -accomodate. +accommodate. This is used whenever a new GPT is created. By default, the .Nm
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:13:15 UTC 2013
Modified Files:
src/sys/dev/acpi: acpi_verbose.c
src/sys/dev/ic: nslm7x.c
src/sys/fs/smbfs: smbfs_node.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/smbfs/smbfs_node.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.16 src/sys/dev/acpi/acpi_verbose.c:1.17
--- src/sys/dev/acpi/acpi_verbose.c:1.16 Mon Jan 3 03:50:23 2011
+++ src/sys/dev/acpi/acpi_verbose.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.16 2011/01/03 08:50:23 jruoho Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.17 2013/10/20 21:13:15 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2010 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.16 2011/01/03 08:50:23 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.17 2013/10/20 21:13:15 christos Exp $");
#include
#include
@@ -172,7 +172,6 @@ acpi_print_dev_real(const char *pnpstr)
static void
acpi_print_madt(struct acpi_softc *sc)
{
- ACPI_TABLE_MADT *madt;
ACPI_STATUS rv;
rv = acpi_madt_map();
@@ -183,7 +182,6 @@ acpi_print_madt(struct acpi_softc *sc)
if (madt_header == NULL)
return;
- madt = (ACPI_TABLE_MADT *)madt_header;
acpi_madt_walk(acpi_print_madt_callback, sc);
}
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.59 src/sys/dev/ic/nslm7x.c:1.60
--- src/sys/dev/ic/nslm7x.c:1.59 Sat Jan 21 10:50:13 2012
+++ src/sys/dev/ic/nslm7x.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $ */
+/* $NetBSD: nslm7x.c,v 1.60 2013/10/20 21:13:15 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.60 2013/10/20 21:13:15 christos Exp $");
#include
#include
@@ -1819,7 +1819,7 @@ static int
wb_match(struct lm_softc *sc)
{
const char *model = NULL;
- int banksel, vendid, devid, cf_flags;
+ int banksel, vendid, cf_flags;
aprint_naive("\n");
aprint_normal("\n");
@@ -1835,7 +1835,7 @@ wb_match(struct lm_softc *sc)
/* Read device/chip ID */
lm_generic_banksel(sc, WB_BANKSEL_B0);
- devid = (*sc->lm_readreg)(sc, LMD_CHIPID);
+ (void)(*sc->lm_readreg)(sc, LMD_CHIPID);
sc->chipid = (*sc->lm_readreg)(sc, WB_BANK0_CHIPID);
lm_generic_banksel(sc, banksel);
cf_flags = device_cfdata(sc->sc_dev)->cf_flags;
Index: src/sys/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.49 src/sys/fs/smbfs/smbfs_node.c:1.50
--- src/sys/fs/smbfs/smbfs_node.c:1.49 Thu Nov 29 06:58:49 2012
+++ src/sys/fs/smbfs/smbfs_node.c Sun Oct 20 17:13:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.49 2012/11/29 11:58:49 nakayama Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.50 2013/10/20 21:13:15 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.49 2012/11/29 11:58:49 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_node.c,v 1.50 2013/10/20 21:13:15 christos Exp $");
#include
#include
@@ -99,7 +99,7 @@ smbfs_node_alloc(struct mount *mp, struc
struct vattr vattr;
struct smbmount *smp = VFSTOSMBFS(mp);
struct smbnode_hashhead *nhpp;
- struct smbnode *np, *np2, *dnp;
+ struct smbnode *np, *np2;
struct vnode *vp;
u_long hashval;
int error;
@@ -121,8 +121,8 @@ smbfs_node_alloc(struct mount *mp, struc
return (error);
}
- dnp = dvp ? VTOSMB(dvp) : NULL;
#ifdef DIAGNOSTIC
+ struct smbnode *dnp = dvp ? VTOSMB(dvp) : NULL;
if (dnp == NULL && dvp != NULL)
panic("smbfs_node_alloc: dead parent vnode %p", dvp);
#endif
CVS commit: src/sys/fs/efs
Module Name:src Committed By: christos Date: Sun Oct 20 21:12:08 UTC 2013 Modified Files: src/sys/fs/efs: efs_subr.c Log Message: Now that KASSERT will always consume its arguments, move a KASSERT inside a DIAGNOSTIC, because the function used is only defined with DIAGNOSTIC. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/fs/efs/efs_subr.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/fs/efs/efs_subr.c diff -u src/sys/fs/efs/efs_subr.c:1.8 src/sys/fs/efs/efs_subr.c:1.9 --- src/sys/fs/efs/efs_subr.c:1.8 Thu Dec 20 03:03:42 2012 +++ src/sys/fs/efs/efs_subr.c Sun Oct 20 17:12:08 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: efs_subr.c,v 1.8 2012/12/20 08:03:42 hannken Exp $ */ +/* $NetBSD: efs_subr.c,v 1.9 2013/10/20 21:12:08 christos Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble @@ -17,7 +17,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.8 2012/12/20 08:03:42 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.9 2013/10/20 21:12:08 christos Exp $"); #include #include @@ -350,7 +350,9 @@ efs_inode_lookup(struct efs_mount *emp, int ret; KASSERT(VOP_ISLOCKED(ei->ei_vp)); +#ifdef DIAGNOSTIC KASSERT(efs_is_inode_synced(ei) == 0); +#endif KASSERT((ei->ei_mode & S_IFMT) == S_IFDIR); efs_extent_iterator_init(&exi, ei, 0);
CVS commit: src/sys/dev/iscsi
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:11:15 UTC 2013
Modified Files:
src/sys/dev/iscsi: iscsi_rcv.c
Log Message:
2 splbios in a row does not make sense. make the second one splx.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/iscsi/iscsi_rcv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/iscsi/iscsi_rcv.c
diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.4 src/sys/dev/iscsi/iscsi_rcv.c:1.5
--- src/sys/dev/iscsi/iscsi_rcv.c:1.4 Sat Dec 29 06:05:30 2012
+++ src/sys/dev/iscsi/iscsi_rcv.c Sun Oct 20 17:11:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_rcv.c,v 1.4 2012/12/29 11:05:30 mlelstv Exp $ */
+/* $NetBSD: iscsi_rcv.c,v 1.5 2013/10/20 21:11:15 christos Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1143,7 +1143,7 @@ receive_pdu(connection_t *conn, pdu_t *p
throttle_ccb(req_ccb, FALSE);
TAILQ_INSERT_TAIL(&waiting, req_ccb, chain);
}
- splbio();
+ splx(s);
while ((req_ccb = TAILQ_FIRST(&waiting)) != NULL) {
TAILQ_REMOVE(&waiting, req_ccb, chain);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:06:09 UTC 2013
Modified Files:
src/sys/dev/pci: azalia.c
Log Message:
move debugging code inside ifdef debug
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/azalia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.79 src/sys/dev/pci/azalia.c:1.80
--- src/sys/dev/pci/azalia.c:1.79 Wed Nov 23 22:35:58 2011
+++ src/sys/dev/pci/azalia.c Sun Oct 20 17:06:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.79 2011/11/24 03:35:58 mrg Exp $ */
+/* $NetBSD: azalia.c,v 1.80 2013/10/20 21:06:09 christos Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.79 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.80 2013/10/20 21:06:09 christos Exp $");
#include
#include
@@ -1314,10 +1314,11 @@ azalia_codec_construct_format(codec_t *t
{
#ifdef AZALIA_DEBUG
char flagbuf[FLAGBUFLEN];
+ int prev_dac = this->dacs.cur;
+ int prev_adc = this->adcs.cur;
#endif
const convgroup_t *group;
uint32_t bits_rates;
- int prev_dac, prev_adc;
int variation;
int nbits, c, chan, i, err;
nid_t nid;
@@ -1325,7 +1326,6 @@ azalia_codec_construct_format(codec_t *t
variation = 0;
chan = 0;
- prev_dac = this->dacs.cur;
if (newdac >= 0 && newdac < this->dacs.ngroups) {
this->dacs.cur = newdac;
group = &this->dacs.groups[this->dacs.cur];
@@ -1349,7 +1349,6 @@ azalia_codec_construct_format(codec_t *t
variation = group->nconv * nbits;
}
- prev_adc = this->adcs.cur;
if (newadc >= 0 && newadc < this->adcs.ngroups) {
this->adcs.cur = newadc;
group = &this->adcs.groups[this->adcs.cur];
CVS commit: src/sys/dist/pf/net
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:05:47 UTC 2013
Modified Files:
src/sys/dist/pf/net: pf.c pf_norm.c pfvar.h
Log Message:
fix compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dist/pf/net/pf.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dist/pf/net/pfvar.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.69 src/sys/dist/pf/net/pf.c:1.70
--- src/sys/dist/pf/net/pf.c:1.69 Thu Mar 22 16:34:38 2012
+++ src/sys/dist/pf/net/pf.c Sun Oct 20 17:05:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.69 2012/03/22 20:34:38 drochner Exp $ */
+/* $NetBSD: pf.c,v 1.70 2013/10/20 21:05:47 christos Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.69 2012/03/22 20:34:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.70 2013/10/20 21:05:47 christos Exp $");
#include "pflog.h"
@@ -2820,7 +2820,6 @@ pf_socket_lookup(int direction, struct p
#endif /* INET */
#ifdef INET6
case AF_INET6:
-/*###2817 [cc] warning: assignment from incompatible pointer type%%%*/
in6p = in6_pcbhashlookup(tb, &saddr->v6, sport, &daddr->v6,
dport);
if (inp == NULL) {
@@ -2844,7 +2843,6 @@ pf_socket_lookup(int direction, struct p
#endif
#ifdef INET6
case AF_INET6:
-/*###2840 [cc] error: 'struct inpcb' has no member named 'in6p_head'%%%*/
so = in6p->in6p_socket;
break;
#endif /* INET6 */
@@ -3089,7 +3087,7 @@ pf_test_rule(struct pf_rule **rm, struct
u_int8_t icmptype = 0, icmpcode = 0;
if (direction == PF_IN && pf_check_congestion(ifq)) {
- REASON_SET(&reason, PFRES_CONGEST);
+ REASON_SET_NOPTR(&reason, PFRES_CONGEST);
return (PF_DROP);
}
@@ -3340,7 +3338,7 @@ pf_test_rule(struct pf_rule **rm, struct
a = *am;
ruleset = *rsm;
- REASON_SET(&reason, PFRES_MATCH);
+ REASON_SET_NOPTR(&reason, PFRES_MATCH);
if (r->log || (nr != NULL && nr->log)) {
if (rewrite)
@@ -3350,7 +3348,7 @@ pf_test_rule(struct pf_rule **rm, struct
}
if (r->keep_state && pf_state_lock) {
- REASON_SET(&reason, PFRES_STATELOCKED);
+ REASON_SET_NOPTR(&reason, PFRES_STATELOCKED);
return PF_DROP;
}
@@ -3446,7 +3444,7 @@ pf_test_rule(struct pf_rule **rm, struct
if (pf_check_proto_cksum(m, off,
ntohs(hip->ip_len) - off, IPPROTO_TCP, AF_INET))
#endif /* !__NetBSD__ */
-REASON_SET(&reason, PFRES_PROTCKSUM);
+REASON_SET_NOPTR(&reason, PFRES_PROTCKSUM);
else {
if (th->th_flags & TH_SYN)
ack++;
@@ -3469,7 +3467,7 @@ pf_test_rule(struct pf_rule **rm, struct
return (PF_DROP);
if (pf_tag_packet(m, tag, rtableid)) {
- REASON_SET(&reason, PFRES_MEMORY);
+ REASON_SET_NOPTR(&reason, PFRES_MEMORY);
return (PF_DROP);
}
@@ -3484,14 +3482,14 @@ pf_test_rule(struct pf_rule **rm, struct
/* check maximums */
if (r->max_states && (r->states >= r->max_states)) {
pf_status.lcounters[LCNT_STATES]++;
- REASON_SET(&reason, PFRES_MAXSTATES);
+ REASON_SET_NOPTR(&reason, PFRES_MAXSTATES);
goto cleanup;
}
/* src node for filter rule */
if ((r->rule_flag & PFRULE_SRCTRACK ||
r->rpool.opts & PF_POOL_STICKYADDR) &&
pf_insert_src_node(&sn, r, saddr, af) != 0) {
- REASON_SET(&reason, PFRES_SRCLIMIT);
+ REASON_SET_NOPTR(&reason, PFRES_SRCLIMIT);
goto cleanup;
}
/* src node for translation rule */
@@ -3499,12 +3497,12 @@ pf_test_rule(struct pf_rule **rm, struct
((direction == PF_OUT &&
pf_insert_src_node(&nsn, nr, &pd->baddr, af) != 0) ||
(pf_insert_src_node(&nsn, nr, saddr, af) != 0))) {
- REASON_SET(&reason, PFRES_SRCLIMIT);
+ REASON_SET_NOPTR(&reason, PFRES_SRCLIMIT);
goto cleanup;
}
s = pool_get(&pf_state_pl, PR_NOWAIT);
if (s == NULL) {
- REASON_SET(&reason, PFRES_MEMORY);
+ REASON_SET_NOPTR(&reason, PFRES_MEMORY);
cleanup:
if (sn != NULL && sn->states == 0 && sn->expire == 0) {
RB_REMOVE(pf_src_tree, &tree_src_tracking, sn);
@@ -3603,7 +3601,7 @@ cleanup:
if ((pd->flags & PFDESC_TCP_NORM) &&
pf_normalize_tcp_init(m, off, pd, th, &s->src,
&s->dst)) {
-REASON_SET(&reason, PFRES_MEMORY);
+REASON_SET_NOPTR(&reason, PFRES_MEMORY);
pf_src_tree_remove_state(s);
STATE_DEC_COUNTERS(s);
pool_put(&pf_state_pl, s);
@@ -3625,7 +3623,7 @@ cleanup:
}
if ((sk = pf_alloc_state_key(s)) == NULL) {
- REASON_SET(&reason, PFRES_MEMORY);
+ REASON_SET_NOPTR(&reason, PFRES_MEMORY);
goto cleanup;
}
@@ -3683,7 +3681,7 @@ cleanup:
if (pf_insert_state(bound_iface(r, nr, kif), s)) {
if (pd->proto == IPPROTO_TCP)
pf_normalize_tcp_cleanup(s);
- REASON_SET(&reason, PFRES_STATEINS);
+ REASON_SET_NOPTR(&reason, PFRES_STATEINS);
pf_src_tree_remove_stat
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: christos
Date: Sun Oct 20 21:06:37 UTC 2013
Modified Files:
src/sys/arch/i386/stand/lib: dosfile.c
Log Message:
remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/stand/lib/dosfile.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/i386/stand/lib/dosfile.c
diff -u src/sys/arch/i386/stand/lib/dosfile.c:1.15 src/sys/arch/i386/stand/lib/dosfile.c:1.16
--- src/sys/arch/i386/stand/lib/dosfile.c:1.15 Thu Jun 16 09:27:59 2011
+++ src/sys/arch/i386/stand/lib/dosfile.c Sun Oct 20 17:06:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dosfile.c,v 1.15 2011/06/16 13:27:59 joerg Exp $ */
+/* $NetBSD: dosfile.c,v 1.16 2013/10/20 21:06:37 christos Exp $ */
/*
* Copyright (c) 1996
@@ -178,9 +178,6 @@ dos_write(struct open_file *f, void *sta
__compactcall int
dos_stat(struct open_file *f, struct stat *sb)
{
- struct dosfile *df;
- df = (struct dosfile *) f->f_fsdata;
-
sb->st_mode = 0444;
sb->st_nlink = 1;
sb->st_uid = 0;
CVS commit: src/sbin/slattach
Module Name:src
Committed By: mbalmer
Date: Sun Oct 20 20:17:52 UTC 2013
Modified Files:
src/sbin/slattach: slattach.c
Log Message:
attach tty line discipline by name, not by number. remove unused case value.
lgtm christos
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sbin/slattach/slattach.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/slattach/slattach.c
diff -u src/sbin/slattach/slattach.c:1.32 src/sbin/slattach/slattach.c:1.33
--- src/sbin/slattach/slattach.c:1.32 Fri Dec 30 03:19:36 2011
+++ src/sbin/slattach/slattach.c Sun Oct 20 20:17:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: slattach.c,v 1.32 2011/12/30 03:19:36 christos Exp $ */
+/* $NetBSD: slattach.c,v 1.33 2013/10/20 20:17:52 mbalmer Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: slattach.c,v 1.32 2011/12/30 03:19:36 christos Exp $");
+__RCSID("$NetBSD: slattach.c,v 1.33 2013/10/20 20:17:52 mbalmer Exp $");
#endif
#endif /* not lint */
@@ -67,11 +67,10 @@ __RCSID("$NetBSD: slattach.c,v 1.32 2011
#include
static int speed = 9600;
-static int slipdisc = SLIPDISC;
+static const char *ldisc = "slip";
static char devicename[32];
-static int ttydisc(char *);
__dead static void usage(void);
int
@@ -105,8 +104,8 @@ main(int argc, char *argv[])
case 's':
speed = atoi(optarg);
break;
- case 'r': case 't':
- slipdisc = ttydisc(optarg);
+ case 't':
+ ldisc = optarg;
break;
case '?':
default:
@@ -138,8 +137,8 @@ main(int argc, char *argv[])
err(1, "tcsetattr");
if (ioctl(fd, TIOCSDTR, 0) < 0 && errno != ENOTTY)
err(1, "TIOCSDTR");
- if (ioctl(fd, TIOCSETD, &slipdisc) < 0)
- err(1, "TIOCSETD");
+ if (ioctl(fd, TIOCSLINED, ldisc) < 0)
+ err(1, "TIOCSLINED");
if (opt_detach && daemon(0, 0) != 0)
err(1, "couldn't detach");
sigemptyset(&nsigset);
@@ -147,21 +146,6 @@ main(int argc, char *argv[])
sigsuspend(&nsigset);
}
-static int
-ttydisc(char *name)
-{
- if (strcmp(name, "slip") == 0)
- return(SLIPDISC);
-#ifdef STRIPDISC
- else if (strcmp(name, "strip") == 0)
- return(STRIPDISC);
-#endif
- else
- usage();
- /* NOTREACHED */
- return -1;
-}
-
static void
usage(void)
{
CVS commit: src/sys/arch/i386/stand/pxeboot
Module Name:src Committed By: christos Date: Sun Oct 20 19:47:28 UTC 2013 Modified Files: src/sys/arch/i386/stand/pxeboot: pxe.c pxe_call.S Log Message: Revert previous code move to accommodate relocation that does not fit. Move pxe_command_buf declaration next to the code so that it fits on the 16 bit relocation. It is in the text segment, but it does not matter since it is mapped read-write. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/pxeboot/pxe.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/pxeboot/pxe_call.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/i386/stand/pxeboot/pxe.c diff -u src/sys/arch/i386/stand/pxeboot/pxe.c:1.17 src/sys/arch/i386/stand/pxeboot/pxe.c:1.18 --- src/sys/arch/i386/stand/pxeboot/pxe.c:1.17 Sun Dec 13 18:01:42 2009 +++ src/sys/arch/i386/stand/pxeboot/pxe.c Sun Oct 20 15:47:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pxe.c,v 1.17 2009/12/13 23:01:42 jakllsch Exp $ */ +/* $NetBSD: pxe.c,v 1.18 2013/10/20 19:47:28 christos Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -107,7 +107,7 @@ void (*pxe_call)(uint16_t); void pxecall_bangpxe(uint16_t); /* pxe_call.S */ void pxecall_pxenv(uint16_t); /* pxe_call.S */ -char pxe_command_buf[256]; +extern char pxe_command_buf[256]; BOOTPLAYER bootplayer; Index: src/sys/arch/i386/stand/pxeboot/pxe_call.S diff -u src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.4 src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.5 --- src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.4 Sat Oct 19 20:16:16 2013 +++ src/sys/arch/i386/stand/pxeboot/pxe_call.S Sun Oct 20 15:47:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pxe_call.S,v 1.4 2013/10/20 00:16:16 christos Exp $ */ +/* $NetBSD: pxe_call.S,v 1.5 2013/10/20 19:47:28 christos Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -88,10 +88,10 @@ ENTRY(pxecall_pxenv) movl 8(%ebp), %ebx call _C_LABEL(prot_to_real) # enter real mode - /* prot_to_real() has already set %es to BOOTSEG */ - lea _C_LABEL(pxe_command_buf), %edi .code16 + /* prot_to_real() has already set %es to BOOTSEG */ + lea _C_LABEL(pxe_command_buf), %di /* The encoding is: 0x9a offlo offhi seglo seghi */ lcall $0, $0x @@ -109,3 +109,10 @@ _C_LABEL(pxenv_seg) = . - 2 popl %ebx popl %ebp ret + + .globl _C_LABEL(pxe_command_buf) + .align 32 + .type _C_LABEL(pxe_command_buf), @object + .size _C_LABEL(pxe_command_buf), 256 +_C_LABEL(pxe_command_buf): + .zero 256
CVS commit: src/tests/net/net
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:36:36 UTC 2013
Modified Files:
src/tests/net/net: t_unix.c
Log Message:
write fail as a proper macro
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/net/net/t_unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/net/t_unix.c
diff -u src/tests/net/net/t_unix.c:1.9 src/tests/net/net/t_unix.c:1.10
--- src/tests/net/net/t_unix.c:1.9 Thu Oct 17 08:52:09 2013
+++ src/tests/net/net/t_unix.c Sun Oct 20 13:36:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unix.c,v 1.9 2013/10/17 12:52:09 christos Exp $ */
+/* $NetBSD: t_unix.c,v 1.10 2013/10/20 17:36:36 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include
#ifdef __RCSID
-__RCSID("$Id: t_unix.c,v 1.9 2013/10/17 12:52:09 christos Exp $");
+__RCSID("$Id: t_unix.c,v 1.10 2013/10/20 17:36:36 christos Exp $");
#else
#define getprogname() argv[0]
#endif
@@ -65,7 +65,11 @@ __RCSID("$Id: t_unix.c,v 1.9 2013/10/17
#else
#include
-#define FAIL(msg, ...) ATF_CHECK_MSG(0, msg, ## __VA_ARGS__); goto fail
+#define FAIL(msg, ...) \
+ do { \
+ ATF_CHECK_MSG(0, msg, ## __VA_ARGS__); \
+ goto fail; \
+ } while (/*CONSTCOND*/0)
#endif
CVS commit: src/tests/usr.sbin/mtree
Module Name:src Committed By: christos Date: Sun Oct 20 17:27:37 UTC 2013 Modified Files: src/tests/usr.sbin/mtree: mtree_d_create.out Log Message: adjust output now that we don't output size info for links and directories by default. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/mtree/mtree_d_create.out Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.sbin/mtree/mtree_d_create.out diff -u src/tests/usr.sbin/mtree/mtree_d_create.out:1.2 src/tests/usr.sbin/mtree/mtree_d_create.out:1.3 --- src/tests/usr.sbin/mtree/mtree_d_create.out:1.2 Tue Feb 5 11:49:42 2013 +++ src/tests/usr.sbin/mtree/mtree_d_create.out Sun Oct 20 13:27:37 2013 @@ -6,13 +6,13 @@ # . /set type=file nlink=1 . type=dir nlink=4 -a.symlink.1 type=link size=8 link=a.file.1 +a.symlink.1 type=link link=a.file.1 top.dangling \ -type=link size=11 link=nonexistent +type=link link=nonexistent top.file.1 size=18 \ sha256=74c53aaf0cd9543b7efad969de1058ee38859134ba467500b849811fc3513195 top.symlink.b \ -type=link size=1 link=b +type=link link=b # ./a a type=dir nlink=4
CVS commit: src/tests/lib/libc/net
Module Name:src Committed By: christos Date: Sun Oct 20 17:22:49 UTC 2013 Modified Files: src/tests/lib/libc/net: t_hostent.sh Log Message: broadway changed addresses. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/net/t_hostent.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/net/t_hostent.sh diff -u src/tests/lib/libc/net/t_hostent.sh:1.1 src/tests/lib/libc/net/t_hostent.sh:1.2 --- src/tests/lib/libc/net/t_hostent.sh:1.1 Fri Aug 16 11:29:45 2013 +++ src/tests/lib/libc/net/t_hostent.sh Sun Oct 20 13:22:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_hostent.sh,v 1.1 2013/08/16 15:29:45 christos Exp $ +# $NetBSD: t_hostent.sh,v 1.2 2013/10/20 17:22:49 christos Exp $ # # Copyright (c) 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -26,11 +26,11 @@ # n6="sixthavenue.astron.com" -a6="2620:106:3000:100:2e0:81ff:fe2f:e5d6" +a6="2620:106:3003:1f00:2e0:81ff:fe2f:e5d7" ans6="name=$n6, length=16, addrtype=24, aliases=[] addr_list=[$a6]\n" n4="sixthavenue.astron.com" -a4="208.77.212.99" +a4="38.117.134.6" ans4="name=$n4, length=4, addrtype=2, aliases=[] addr_list=[$a4]\n" l6="localhost"
CVS commit: src/sys/ufs/chfs
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:18:38 UTC 2013
Modified Files:
src/sys/ufs/chfs: chfs_gc.c chfs_readinode.c chfs_subr.c chfs_vfsops.c
chfs_vnops.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_gc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/chfs/chfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/chfs/chfs_gc.c
diff -u src/sys/ufs/chfs/chfs_gc.c:1.4 src/sys/ufs/chfs/chfs_gc.c:1.5
--- src/sys/ufs/chfs/chfs_gc.c:1.4 Fri Oct 19 08:44:39 2012
+++ src/sys/ufs/chfs/chfs_gc.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_gc.c,v 1.4 2012/10/19 12:44:39 ttoth Exp $ */
+/* $NetBSD: chfs_gc.c,v 1.5 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -985,8 +985,6 @@ chfs_gcollect_deletion_dirent(struct chf
int ret;
- struct vnode *vnode = NULL;
-
dbg_gc("gcollect_deletion_dirent\n");
/* Check node. */
@@ -995,7 +993,7 @@ chfs_gcollect_deletion_dirent(struct chf
nref_len = chfs_nref_len(chmp, cheb, fd->nref);
- vnode = chfs_vnode_lookup(chmp, fd->vno);
+ (void)chfs_vnode_lookup(chmp, fd->vno);
/* Find it in parent dirents. */
for (nref = parent->chvc->dirents;
Index: src/sys/ufs/chfs/chfs_readinode.c
diff -u src/sys/ufs/chfs/chfs_readinode.c:1.7 src/sys/ufs/chfs/chfs_readinode.c:1.8
--- src/sys/ufs/chfs/chfs_readinode.c:1.7 Sat Dec 1 06:31:01 2012
+++ src/sys/ufs/chfs/chfs_readinode.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_readinode.c,v 1.7 2012/12/01 11:31:01 mbalmer Exp $ */
+/* $NetBSD: chfs_readinode.c,v 1.8 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -507,7 +507,6 @@ no_overlapping_node(struct rb_tree *frag
}
rb_tree_insert_node(fragtree, holefrag);
- this = holefrag;
}
rb_tree_insert_node(fragtree, newfrag);
Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.8 src/sys/ufs/chfs/chfs_subr.c:1.9
--- src/sys/ufs/chfs/chfs_subr.c:1.8 Fri Oct 19 08:44:39 2012
+++ src/sys/ufs/chfs/chfs_subr.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.8 2012/10/19 12:44:39 ttoth Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.9 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -253,14 +253,12 @@ chfs_chsize(struct vnode *vp, u_quad_t s
int
chfs_chflags(struct vnode *vp, int flags, kauth_cred_t cred)
{
- struct chfs_mount *chmp;
struct chfs_inode *ip;
int error = 0;
kauth_action_t action = KAUTH_VNODE_WRITE_FLAGS;
bool changing_sysflags = false;
ip = VTOI(vp);
- chmp = ip->chmp;
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return EROFS;
Index: src/sys/ufs/chfs/chfs_vfsops.c
diff -u src/sys/ufs/chfs/chfs_vfsops.c:1.8 src/sys/ufs/chfs/chfs_vfsops.c:1.9
--- src/sys/ufs/chfs/chfs_vfsops.c:1.8 Mon Sep 30 14:58:00 2013
+++ src/sys/ufs/chfs/chfs_vfsops.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vfsops.c,v 1.8 2013/09/30 18:58:00 hannken Exp $ */
+/* $NetBSD: chfs_vfsops.c,v 1.9 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -204,7 +204,6 @@ int
chfs_mountfs(struct vnode *devvp, struct mount *mp)
{
struct lwp *l = curlwp;
- struct proc *p;
kauth_cred_t cred;
devmajor_t flash_major;
dev_t dev;
@@ -216,7 +215,6 @@ chfs_mountfs(struct vnode *devvp, struct
dbg("mountfs()\n");
dev = devvp->v_rdev;
- p = l ? l->l_proc : NULL;
cred = l ? l->l_cred : NOCRED;
/* Flush out any old buffers remaining from a previous use. */
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.17 src/sys/ufs/chfs/chfs_vnops.c:1.18
--- src/sys/ufs/chfs/chfs_vnops.c:1.17 Sun Jun 23 03:28:37 2013
+++ src/sys/ufs/chfs/chfs_vnops.c Sun Oct 20 13:18:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.17 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.18 2013/10/20 17:18:38 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -217,7 +217,6 @@ chfs_mknod(void *v)
struct ufsmount *ump;
struct chfs_mount *chmp;
- ino_t ino;
struct chfs_full_dnode *fd;
struct buf *bp;
@@ -255,7 +254,6 @@ chfs_mknod(void *v)
err = chfs_makeinode(mode, dvp, &vp, cnp, vap->va_type);
ip = VTOI(vp);
- ino = ip->ino;
if (vap->va_rdev != VNOVAL)
ip->rdev = vap->va_rdev;
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:17:30 UTC 2013
Modified Files:
src/sys/lib/libsa: ext2fs.c ufs.c
Log Message:
XXX: gcc initializations
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.63 -r1.64 src/sys/lib/libsa/ufs.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/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.18 src/sys/lib/libsa/ext2fs.c:1.19
--- src/sys/lib/libsa/ext2fs.c:1.18 Sun Jun 23 03:28:36 2013
+++ src/sys/lib/libsa/ext2fs.c Sun Oct 20 13:17:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.18 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: ext2fs.c,v 1.19 2013/10/20 17:17:30 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -341,7 +341,7 @@ buf_read_file(struct open_file *f, char
struct m_ext2fs *fs = fp->f_fs;
long off;
indp_t file_block;
- indp_t disk_block;
+ indp_t disk_block = 0; /* XXX: gcc */
size_t block_size;
int rc;
Index: src/sys/lib/libsa/ufs.c
diff -u src/sys/lib/libsa/ufs.c:1.63 src/sys/lib/libsa/ufs.c:1.64
--- src/sys/lib/libsa/ufs.c:1.63 Sun Jun 23 03:28:36 2013
+++ src/sys/lib/libsa/ufs.c Sun Oct 20 13:17:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs.c,v 1.63 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: ufs.c,v 1.64 2013/10/20 17:17:30 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -267,7 +267,7 @@ read_inode(ino32_t inumber, struct open_
char *buf;
size_t rsize;
int rc;
- daddr_t inode_sector;
+ daddr_t inode_sector = 0; /* XXX: gcc */
#ifdef LIBSA_LFS
struct ufs_dinode *dip;
int cnt;
@@ -428,7 +428,6 @@ buf_read_file(struct open_file *f, char
struct fs *fs = fp->f_fs;
long off;
indp_t file_block;
- indp_t disk_block;
size_t block_size;
int rc;
@@ -441,6 +440,7 @@ buf_read_file(struct open_file *f, char
#endif
if (file_block != fp->f_buf_blkno) {
+ indp_t disk_block = 0; /* XXX: gcc */
rc = block_map(f, file_block, &disk_block);
if (rc)
return rc;
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:16:57 UTC 2013
Modified Files:
src/sys/lib/libsa: netif.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/lib/libsa/netif.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/lib/libsa/netif.c
diff -u src/sys/lib/libsa/netif.c:1.24 src/sys/lib/libsa/netif.c:1.25
--- src/sys/lib/libsa/netif.c:1.24 Sat Jan 17 09:00:36 2009
+++ src/sys/lib/libsa/netif.c Sun Oct 20 13:16:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: netif.c,v 1.24 2009/01/17 14:00:36 tsutsui Exp $ */
+/* $NetBSD: netif.c,v 1.25 2013/10/20 17:16:57 christos Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -92,7 +92,7 @@ netif_match(struct netif *nif, void *mac
struct netif *
netif_select(void *machdep_hint)
{
- int d, u, unit_done, s;
+ int d, u, s;
struct netif_driver *drv;
struct netif cur_if;
static struct netif best_if;
@@ -113,7 +113,6 @@ netif_select(void *machdep_hint)
for (u = 0; u < drv->netif_nifs; u++) {
cur_if.nif_unit = u;
- unit_done = 0;
#ifdef NETIF_DEBUG
if (netif_debug)
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Sun Oct 20 17:15:42 UTC 2013 Modified Files: src/sys/lib/libsa: dosfs.c Log Message: use new function to avoid array overflow To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/lib/libsa/dosfs.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/lib/libsa/dosfs.c diff -u src/sys/lib/libsa/dosfs.c:1.18 src/sys/lib/libsa/dosfs.c:1.19 --- src/sys/lib/libsa/dosfs.c:1.18 Sun Dec 25 01:09:08 2011 +++ src/sys/lib/libsa/dosfs.c Sun Oct 20 13:15:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dosfs.c,v 1.18 2011/12/25 06:09:08 tsutsui Exp $ */ +/* $NetBSD: dosfs.c,v 1.19 2013/10/20 17:15:42 christos Exp $ */ /* * Copyright (c) 1996, 1998 Robert Nordier @@ -570,7 +570,7 @@ lookup(DOS_FS *fs, u_int clus, const cha for (x = 0, i = 0; i < 11; i++) x = x & 1) << 7) | (x >> 1)) + -dir[ent].de.deName[i]) & 0xff; +msdos_dirchar(&dir[ent].de,i)) & 0xff; ok = chk == x && !strcasecmp(name, (const char *)lfn); }
CVS commit: src/sys/fs/filecorefs
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:14:48 UTC 2013
Modified Files:
src/sys/fs/filecorefs: filecore_lookup.c filecore_vnops.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/fs/filecorefs/filecore_lookup.c
cvs rdiff -u -r1.38 -r1.39 src/sys/fs/filecorefs/filecore_vnops.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/fs/filecorefs/filecore_lookup.c
diff -u src/sys/fs/filecorefs/filecore_lookup.c:1.17 src/sys/fs/filecorefs/filecore_lookup.c:1.18
--- src/sys/fs/filecorefs/filecore_lookup.c:1.17 Thu Dec 20 03:03:42 2012
+++ src/sys/fs/filecorefs/filecore_lookup.c Sun Oct 20 13:14:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_lookup.c,v 1.17 2012/12/20 08:03:42 hannken Exp $ */
+/* $NetBSD: filecore_lookup.c,v 1.18 2013/10/20 17:14:48 christos Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.17 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.18 2013/10/20 17:14:48 christos Exp $");
#include
#include
@@ -127,7 +127,6 @@ filecore_lookup(void *v)
} */ *ap = v;
struct vnode *vdp; /* vnode for directory being searched */
struct filecore_node *dp; /* inode for directory being searched */
- struct filecore_mnt *fcmp; /* file system that directory is in */
struct buf *bp; /* a buffer of directory entries */
struct filecore_direntry *de;
int numdirpasses; /* strategy for directory search */
@@ -150,7 +149,6 @@ filecore_lookup(void *v)
*vpp = NULL;
vdp = ap->a_dvp;
dp = VTOI(vdp);
- fcmp = dp->i_mnt;
/*
* Check accessiblity of directory.
Index: src/sys/fs/filecorefs/filecore_vnops.c
diff -u src/sys/fs/filecorefs/filecore_vnops.c:1.38 src/sys/fs/filecorefs/filecore_vnops.c:1.39
--- src/sys/fs/filecorefs/filecore_vnops.c:1.38 Sun Jun 23 03:28:36 2013
+++ src/sys/fs/filecorefs/filecore_vnops.c Sun Oct 20 13:14:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vnops.c,v 1.38 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: filecore_vnops.c,v 1.39 2013/10/20 17:14:48 christos Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.38 2013/06/23 07:28:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.39 2013/10/20 17:14:48 christos Exp $");
#include
#include
@@ -204,7 +204,7 @@ filecore_read(void *v)
struct filecore_node *ip = VTOI(vp);
struct filecore_mnt *fcmp;
struct buf *bp;
- daddr_t lbn, rablock;
+ daddr_t lbn;
off_t diff;
int error = 0;
long size, n, on;
@@ -248,7 +248,6 @@ filecore_read(void *v)
if (diff < n)
n = diff;
size = filecore_blksize(fcmp, ip, lbn);
- rablock = lbn + 1;
if (ip->i_dirent.attr & FILECORE_ATTR_DIR) {
error = filecore_dbread(ip, &bp);
on = uio->uio_offset;
@@ -294,7 +293,6 @@ filecore_readdir(void *v)
struct uio *uio = ap->a_uio;
struct vnode *vdp = ap->a_vp;
struct filecore_node *dp;
- struct filecore_mnt *fcmp;
struct buf *bp = NULL;
struct dirent *de;
struct filecore_direntry *dep = NULL;
@@ -315,7 +313,6 @@ filecore_readdir(void *v)
uiooff = uio->uio_offset;
*ap->a_eofflag = 0;
- fcmp = dp->i_mnt;
error = filecore_dbread(dp, &bp);
if (error) {
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: christos Date: Sun Oct 20 17:14:05 UTC 2013 Modified Files: src/sys/external/bsd/ipf/netinet: ip_auth.c Log Message: ifdef kernel used only variable To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_auth.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/ipf/netinet/ip_auth.c diff -u src/sys/external/bsd/ipf/netinet/ip_auth.c:1.3 src/sys/external/bsd/ipf/netinet/ip_auth.c:1.4 --- src/sys/external/bsd/ipf/netinet/ip_auth.c:1.3 Sun Jul 22 10:27:51 2012 +++ src/sys/external/bsd/ipf/netinet/ip_auth.c Sun Oct 20 13:14:05 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_auth.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ +/* $NetBSD: ip_auth.c,v 1.4 2013/10/20 17:14:05 christos Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -129,7 +129,7 @@ extern struct ifqueue ipintrq; /* ip #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.4 2013/10/20 17:14:05 christos Exp $"); #else static const char rcsid[] = "@(#)Id: ip_auth.c,v 1.1.1.2 2012/07/22 13:45:08 darrenr Exp"; #endif @@ -1147,7 +1147,9 @@ ipf_auth_reply(ipf_main_softc_t *softc, frauth_t auth, *au = &auth, *fra; fr_info_t fin; int error, i; +#ifdef _KERNEL mb_t *m; +#endif SPL_INT(s); error = ipf_inobj(softc, data, NULL, &auth, IPFOBJ_FRAUTH); @@ -1179,9 +1181,11 @@ ipf_auth_reply(ipf_main_softc_t *softc, return ESRCH; } - m = softa->ipf_auth_pkts[i]; fra->fra_index = -2; fra->fra_pass = au->fra_pass; +#ifdef _KERNEL + m = softa->ipf_auth_pkts[i]; +#endif softa->ipf_auth_pkts[i] = NULL; softa->ipf_auth_replies++; bcopy(&fra->fra_info, &fin, sizeof(fin));
CVS commit: src/sys/dev/nand
Module Name:src
Committed By: christos
Date: Sun Oct 20 17:13:18 UTC 2013
Modified Files:
src/sys/dev/nand: nand.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/nand/nand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nand/nand.c
diff -u src/sys/dev/nand/nand.c:1.22 src/sys/dev/nand/nand.c:1.23
--- src/sys/dev/nand/nand.c:1.22 Sat Nov 3 08:45:28 2012
+++ src/sys/dev/nand/nand.c Sun Oct 20 13:13:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.c,v 1.22 2012/11/03 12:45:28 ahoka Exp $ */
+/* $NetBSD: nand.c,v 1.23 2013/10/20 17:13:18 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NAND chips implementing the ONFI 2.2 specification */
#include
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.22 2012/11/03 12:45:28 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.23 2013/10/20 17:13:18 christos Exp $");
#include "locators.h"
@@ -863,7 +863,7 @@ nand_markbad(device_t self, size_t offse
{
struct nand_softc *sc = device_private(self);
struct nand_chip *chip = &sc->sc_chip;
- flash_off_t blockoffset, marker;
+ flash_off_t blockoffset;
#ifdef NAND_BBT
flash_off_t block;
@@ -872,7 +872,6 @@ nand_markbad(device_t self, size_t offse
nand_bbt_block_markbad(self, block);
#endif
blockoffset = offset & chip->nc_block_mask;
- marker = chip->nc_badmarker_offs & ~0x01;
/* check if it is already marked bad */
if (nand_isbad(self, blockoffset))
CVS commit: src/tools/gcc
Module Name:src
Committed By: skrll
Date: Sun Oct 20 17:12:23 UTC 2013
Modified Files:
src/tools/gcc: Makefile
Log Message:
Group the mknative stuff together - no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.58 src/tools/gcc/Makefile:1.59
--- src/tools/gcc/Makefile:1.58 Sun Oct 20 17:10:15 2013
+++ src/tools/gcc/Makefile Sun Oct 20 17:12:23 2013
@@ -1,25 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2013/10/20 17:10:15 skrll Exp $
+# $NetBSD: Makefile,v 1.59 2013/10/20 17:12:23 skrll Exp $
.include
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
-MKNATIVE_CONFIG_TARGET_LIBS= \
- configure-target-libstdc++-v3 \
- configure-target-libobjc
-
-.if ${HAVE_GCC} == 45
-MKNATIVE_TARGET= gcc45
-GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
-.else
-MKNATIVE_TARGET= gcc4
-.endif
-
-BINENV= /usr/bin/env -i
-
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
MULTILIB_ARGS= --enable-multilib
.else
@@ -69,6 +54,30 @@ MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKE
CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \
gcc_cv_as_sparc_gotdata_op=no
+ALL_TARGET= all-gcc
+INSTALL_TARGET= install-gcc
+
+.include "${.CURDIR}/../Makefile.gmakehost"
+BUILD_MAKE=${TOOL_GMAKE}
+
+#
+# mknative-gcc specific stuff
+#
+MKNATIVE_CONFIG_TARGET_LIBS= \
+ configure-target-libstdc++-v3 \
+ configure-target-libobjc
+
+.if ${HAVE_GCC} == 45
+MKNATIVE_TARGET= gcc45
+GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+ configure-target-libgomp
+.else
+MKNATIVE_TARGET= gcc4
+.endif
+
+BINENV= /usr/bin/env -i
+
MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
CC_FOR_BUILD=${HOST_CC:Q} \
CC=${CC:Q}' '${CCADDFLAGS:Q} \
@@ -90,16 +99,6 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
gdb_cv_scanf_has_long_double=yes \
gcc_cv_as_sparc_gotdata_op=no
-ALL_TARGET= all-gcc
-INSTALL_TARGET= install-gcc
-
-.include "${.CURDIR}/../Makefile.gmakehost"
-BUILD_MAKE=${TOOL_GMAKE}
-
-#
-# mknative-gcc specific stuff
-#
-
.if ${HAVE_GCC} < 45
GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
.else
CVS commit: src/tools/gcc
Module Name:src
Committed By: skrll
Date: Sun Oct 20 17:10:15 UTC 2013
Modified Files:
src/tools/gcc: Makefile
Log Message:
g/c VAX_CONFIGURE_ARGS
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.57 src/tools/gcc/Makefile:1.58
--- src/tools/gcc/Makefile:1.57 Thu Jul 18 22:00:48 2013
+++ src/tools/gcc/Makefile Sun Oct 20 17:10:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2013/07/18 22:00:48 matt Exp $
+# $NetBSD: Makefile,v 1.58 2013/10/20 17:10:15 skrll Exp $
.include
@@ -20,8 +20,6 @@ MKNATIVE_TARGET= gcc4
BINENV= /usr/bin/env -i
-VAX_CONFIGURE_ARGS=
-
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
MULTILIB_ARGS= --enable-multilib
.else
@@ -38,7 +36,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
--with-pkgversion="NetBSD nb1 20120916" \
--with-system-zlib \
- ${VAX_CONFIGURE_ARGS} \
--enable-__cxa_atexit
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
CVS commit: src/tools/gcc
Module Name:src Committed By: skrll Date: Sun Oct 20 16:00:20 UTC 2013 Modified Files: src/tools/gcc: mknative.common Log Message: Make sure gmake is quiet when grabbing variables. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/gcc/mknative.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/gcc/mknative.common diff -u src/tools/gcc/mknative.common:1.9 src/tools/gcc/mknative.common:1.10 --- src/tools/gcc/mknative.common:1.9 Mon Feb 5 18:26:01 2007 +++ src/tools/gcc/mknative.common Sun Oct 20 16:00:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp $ +# $NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $ # # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp # @@ -24,7 +24,7 @@ getvars() _mf="$1"; shift case "$MAKE" in *gmake) - env MAKEFLAGS= $MAKE -f - -f "$_TMPDIR/$_mf" _x_ <$_TOP/$1.tmp || \ bomb "cannot create $1" grep '$''NetBSD' $0 | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp - echo '$NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp + echo '$NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp echo '' >>$_TOP/$1.tmp writefile $1 } @@ -64,7 +64,7 @@ write_mk() echo '# This file is automatically generated. DO NOT EDIT!' >$_TOP/$1.tmp || \ bomb "cannot create $1" grep '$''NetBSD' $0 | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp - echo '$NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp + echo '$NetBSD: mknative.common,v 1.10 2013/10/20 16:00:20 skrll Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp echo '#' >>$_TOP/$1.tmp writefile $1 }
CVS commit: src/tools/gcc
Module Name:src
Committed By: skrll
Date: Sun Oct 20 14:55:28 UTC 2013
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
Deleted 1 line too many in previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.72 src/tools/gcc/mknative-gcc:1.73
--- src/tools/gcc/mknative-gcc:1.72 Sun Oct 20 14:14:18 2013
+++ src/tools/gcc/mknative-gcc Sun Oct 20 14:55:28 2013
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.72 2013/10/20 14:14:18 skrll Exp $
+# $NetBSD: mknative-gcc,v 1.73 2013/10/20 14:55:28 skrll Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -622,6 +622,7 @@ get_gcc () {
getvars libcpp/Makefile \
libcpp_a_OBJS
;;
+ esac
getvars gcc/Makefile \
ENABLE_SHARED
case ${_subdir} in
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Sun Oct 20 14:53:23 UTC 2013
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/lldb: Makefile
src/external/bsd/llvm/lib: Makefile
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMMC: Makefile
Added Files:
src/external/bsd/llvm/lib/liblldbPluginPlatformWindows: Makefile
Log Message:
Update to LLVM/Clang r193040 for a bug fix in the phi splitting around
landing pads.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/lldb/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMMC/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/llvm/lib/liblldbPluginPlatformWindows/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/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.58 src/external/bsd/llvm/Makefile.inc:1.59
--- src/external/bsd/llvm/Makefile.inc:1.58 Mon Oct 14 21:19:16 2013
+++ src/external/bsd/llvm/Makefile.inc Sun Oct 20 14:53:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.58 2013/10/14 21:19:16 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.59 2013/10/20 14:53:22 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
SVN_ROOT= http://llvm.org/svn/llvm-project
-COMMON_REVISION= 192615
+COMMON_REVISION= 193040
CLANG_REVISION= ${COMMON_REVISION}
COMPILER_RT_REVISION= ${COMMON_REVISION}
LLD_REVISION= ${COMMON_REVISION}
Index: src/external/bsd/llvm/bin/lldb/Makefile
diff -u src/external/bsd/llvm/bin/lldb/Makefile:1.1 src/external/bsd/llvm/bin/lldb/Makefile:1.2
--- src/external/bsd/llvm/bin/lldb/Makefile:1.1 Sun Sep 29 12:11:59 2013
+++ src/external/bsd/llvm/bin/lldb/Makefile Sun Oct 20 14:53:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/09/29 12:11:59 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2013/10/20 14:53:22 joerg Exp $
PROG_CXX= lldb
NOMAN= yes
@@ -8,7 +8,10 @@ NOMAN= yes
.PATH: ${LLDB_SRCDIR}/tools/driver
SRCS= Driver.cpp \
- IOChannel.cpp
+ ELWrapper.cpp \
+ GetOptWrapper.cpp \
+ IOChannel.cpp \
+ Platform.cpp
CPPFLAGS.Driver.cpp+= -Dgetopt_long_only=getopt_long
@@ -55,6 +58,7 @@ LLDB_LIBS+= \
PluginPlatformLinux \
PluginPlatformMacOSX \
PluginPlatformPOSIX \
+ PluginPlatformWindows \
PluginProcessElfCore \
PluginProcessNetBSD \
PluginProcessPOSIX \
Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.34 src/external/bsd/llvm/lib/Makefile:1.35
--- src/external/bsd/llvm/lib/Makefile:1.34 Sun Sep 29 12:11:59 2013
+++ src/external/bsd/llvm/lib/Makefile Sun Oct 20 14:53:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/09/29 12:11:59 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2013/10/20 14:53:22 joerg Exp $
.include
@@ -197,6 +197,7 @@ SUBDIR+= \
liblldbPluginPlatformLinux \
liblldbPluginPlatformMacOSX \
liblldbPluginPlatformPOSIX \
+ liblldbPluginPlatformWindows \
liblldbPluginProcessElfCore \
liblldbPluginProcessNetBSD \
liblldbPluginProcessGDBRemote \
Index: src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.23 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.24
--- src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile:1.23 Mon Oct 14 21:19:16 2013
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile Sun Oct 20 14:53:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/14 21:19:16 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2013/10/20 14:53:22 joerg Exp $
LIB= LLVMCodeGen
@@ -40,10 +40,11 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
LiveIntervalAnalysis.cpp \
LiveIntervalUnion.cpp \
LiveRangeCalc.cpp \
+ LiveRangeEdit.cpp \
LiveRegMatrix.cpp \
+ LiveRegUnits.cpp \
LiveStackAnalysis.cpp \
LiveVariables.cpp \
- LiveRangeEdit.cpp \
LocalStackSlotAllocation.cpp \
MachineBasicBlock.cpp \
MachineBranchProbabilityInfo.cpp \
Index: src/external/bsd/llvm/lib/libLLVMMC/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.13 src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.14
--- src/external/bsd/llvm/lib/libLLVMMC/Makefile:1.13 Mon Sep 2 14:34:56 2013
+++ src/external/bsd/llvm/lib/libLLVMMC/Makefile Sun Oct 20 14:53:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/09/02 14:34:56 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2013/10/20 14:53:23 joerg Exp $
LIB= LLVMMC
@@ -11,6 +11,7 @@ SRCS+= ELFObjectWriter.cpp \
MCAsmInfo.cpp \
MCAsmInfoCOFF.cpp \
MCAsmInfoDarwin.cpp \
+ MCAsmInfoELF.cpp \
MCAsmStreamer.cpp \
MCAssembler.cpp \
MCAtom.cpp \
Added files:
Index: src/external/bsd/llvm/lib/liblldbPluginPlatformWindows/M
CVS commit: src/tools/gcc
Module Name:src
Committed By: skrll
Date: Sun Oct 20 14:14:18 UTC 2013
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
g/c gcc3 goop
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.71 src/tools/gcc/mknative-gcc:1.72
--- src/tools/gcc/mknative-gcc:1.71 Fri Jun 28 08:30:10 2013
+++ src/tools/gcc/mknative-gcc Sun Oct 20 14:14:18 2013
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.71 2013/06/28 08:30:10 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.72 2013/10/20 14:14:18 skrll Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -556,7 +556,7 @@ get_libstdcxx_v3 () {
} | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
}
-# gnu/usr.bin/gcc3 #
+# gnu/usr.bin/gcc* #
get_gcc_bootstrap () {
_subdir="$1"
@@ -622,11 +622,6 @@ get_gcc () {
getvars libcpp/Makefile \
libcpp_a_OBJS
;;
- gcc3)
- getvars gcc/Makefile \
-LIBCPP_OBJS LIBCPP_H
- ;;
- esac
getvars gcc/Makefile \
ENABLE_SHARED
case ${_subdir} in
@@ -697,11 +692,6 @@ __EOF__
case "$1" in
# .mk and .h files for libgcc bootstrap (from host build)
-libgcc)
- get_libgcc gcc3
- get_crtstuff crtstuff3
- exit 0
- ;;
libgcc4)
get_libgcc gcc4
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 20 14:06:27 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Tickets 1881, 1882, 1883, 1885, 1886 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.33 src/doc/CHANGES-5.3:1.1.2.34 --- src/doc/CHANGES-5.3:1.1.2.33 Sun Oct 13 07:26:13 2013 +++ src/doc/CHANGES-5.3 Sun Oct 20 14:06:27 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.33 2013/10/13 07:26:13 jdc Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.34 2013/10/20 14:06:27 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -593,3 +593,29 @@ xsrc/xfree/xc/programs/Xserver/dix/dixfo references *c. [spz, ticket #966] +lib/libpthread/pthread.c 1.137 via patch + + return errno if pthread_create hits the system limit, not just -1 + [riastradh, ticket #1881] + +gnu/dist/texinfo/util/texi2dvi 1.10 + + Remove trailing whitespace in texi2dvi which confuses sed. + [riastradh, ticket #1882] + +common/lib/libc/sys/cpuset.c 1.16 + + _cpuset_create: initialize size argument for sysctl call. + From PR/43837 by Sandy Snaman. + [dholland, ticket #1883] + +usr.bin/systat/keyboard.c 1.25 + + Fix typo that made '?' an erase char instead of DEL as intended. + [dholland, ticket #1885] + +sys/arch/hp700/hp700/autoconf.c 1.51 + + Remember to unmap pagezero once we've finished with it. + [skrll, ticket #1886] +
CVS commit: [netbsd-5] src/sys/arch/hp700/hp700
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 14:05:36 UTC 2013
Modified Files:
src/sys/arch/hp700/hp700 [netbsd-5]: autoconf.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1886):
sys/arch/hp700/hp700/autoconf.c: revision 1.51
Remember to unmap pagezero once we've finished with it. Found by gcc 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.14.1 src/sys/arch/hp700/hp700/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/autoconf.c
diff -u src/sys/arch/hp700/hp700/autoconf.c:1.26 src/sys/arch/hp700/hp700/autoconf.c:1.26.14.1
--- src/sys/arch/hp700/hp700/autoconf.c:1.26 Sun Mar 30 12:39:32 2008
+++ src/sys/arch/hp700/hp700/autoconf.c Sun Oct 20 14:05:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.26 2008/03/30 12:39:32 skrll Exp $ */
+/* $NetBSD: autoconf.c,v 1.26.14.1 2013/10/20 14:05:36 bouyer Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@@ -86,7 +86,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2008/03/30 12:39:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26.14.1 2013/10/20 14:05:36 bouyer Exp $");
#include "opt_kgdb.h"
#include "opt_useleds.h"
@@ -446,6 +446,8 @@ cpu_rootconf(void)
}
printf("dp_flags 0x%x pz_class 0x%x\n", PAGE0->mem_boot.pz_dp.dp_flags,
PAGE0->mem_boot.pz_class);
+
+ hp700_pagezero_unmap(pagezero_cookie);
#endif /* DEBUG */
if (boot_device != NULL)
CVS commit: [netbsd-5] src/usr.bin/systat
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 14:03:59 UTC 2013
Modified Files:
src/usr.bin/systat [netbsd-5]: keyboard.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1885):
usr.bin/systat/keyboard.c: revision 1.25
No David, '\?' is not the del character. Broken in rev 1.21.
XXX pullup-5, pullup-6.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.10.1 src/usr.bin/systat/keyboard.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/systat/keyboard.c
diff -u src/usr.bin/systat/keyboard.c:1.24 src/usr.bin/systat/keyboard.c:1.24.10.1
--- src/usr.bin/systat/keyboard.c:1.24 Mon Dec 31 00:22:14 2007
+++ src/usr.bin/systat/keyboard.c Sun Oct 20 14:03:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $ */
+/* $NetBSD: keyboard.c,v 1.24.10.1 2013/10/20 14:03:59 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $");
+__RCSID("$NetBSD: keyboard.c,v 1.24.10.1 2013/10/20 14:03:59 bouyer Exp $");
#endif /* not lint */
#include
@@ -121,7 +121,7 @@ keyboard(void)
}
continue;
}
- if (ch == '\b' || ch == '\?' || ch == erasechar()) {
+ if (ch == '\b' || ch == '\177' || ch == erasechar()) {
if (col > 0)
col--;
goto doerase;
CVS commit: [netbsd-5] src/common/lib/libc/sys
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 14:02:51 UTC 2013
Modified Files:
src/common/lib/libc/sys [netbsd-5]: cpuset.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1883):
common/lib/libc/sys/cpuset.c: revision 1.16
_cpuset_create: initialize size argument for sysctl call.
>From PR/43837 by Sandy Snaman.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.4.1 src/common/lib/libc/sys/cpuset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/sys/cpuset.c
diff -u src/common/lib/libc/sys/cpuset.c:1.12 src/common/lib/libc/sys/cpuset.c:1.12.4.1
--- src/common/lib/libc/sys/cpuset.c:1.12 Sun Jul 27 05:47:56 2008
+++ src/common/lib/libc/sys/cpuset.c Sun Oct 20 14:02:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuset.c,v 1.12 2008/07/27 05:47:56 dholland Exp $ */
+/* $NetBSD: cpuset.c,v 1.12.4.1 2013/10/20 14:02:51 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _STANDALONE
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: cpuset.c,v 1.12 2008/07/27 05:47:56 dholland Exp $");
+__RCSID("$NetBSD: cpuset.c,v 1.12.4.1 2013/10/20 14:02:51 bouyer Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -141,6 +141,7 @@ _cpuset_create(void)
size_t len;
u_int nc;
+ len = sizeof(nc);
if (sysctl(mib, __arraycount(mib), &nc, &len, NULL, 0) == -1)
return NULL;
CVS commit: [netbsd-5] src/gnu/dist/texinfo/util
Module Name:src Committed By: bouyer Date: Sun Oct 20 14:01:10 UTC 2013 Modified Files: src/gnu/dist/texinfo/util [netbsd-5]: texi2dvi Log Message: Pull up following revision(s) (requested by riastradh in ticket #1882): gnu/dist/texinfo/util/texi2dvi: revision 1.10 Remove trailing whitespace in texi2dvi which confuses sed. XXX pull up to 5, 6? To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.4.1 src/gnu/dist/texinfo/util/texi2dvi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/texinfo/util/texi2dvi diff -u src/gnu/dist/texinfo/util/texi2dvi:1.9 src/gnu/dist/texinfo/util/texi2dvi:1.9.4.1 --- src/gnu/dist/texinfo/util/texi2dvi:1.9 Tue Sep 2 08:00:24 2008 +++ src/gnu/dist/texinfo/util/texi2dvi Sun Oct 20 14:01:10 2013 @@ -605,10 +605,10 @@ $textra" "$filename_input" >"$filename_x # If this is a Texinfo file with a specified input encoding, and # recode is available, then recode to plain 7 bit Texinfo. if test $language = texinfo; then -pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ - t found - d - :found +pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ + t found + d + :found q' encoding=`sed -e "$pgm" "$filename_input"` if $recode && test -n "$encoding" && findprog recode; then
CVS commit: [netbsd-5] src/lib/libpthread
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:58:32 UTC 2013
Modified Files:
src/lib/libpthread [netbsd-5]: pthread.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1881):
lib/libpthread/pthread.c: revision 1.137 via patch
return errno if pthread_create hits the system limit, not just -1
(this is not entirely correct because it can return ENOMEM which is
not mentioned in the spec, but there are other places in pthread_create
whete ENOMEM is returned -- it at all, this should be fixed everywhere)
To generate a diff of this commit:
cvs rdiff -u -r1.106.2.4 -r1.106.2.5 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.106.2.4 src/lib/libpthread/pthread.c:1.106.2.5
--- src/lib/libpthread/pthread.c:1.106.2.4 Sat May 19 16:34:15 2012
+++ src/lib/libpthread/pthread.c Sun Oct 20 13:58:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.106.2.4 2012/05/19 16:34:15 riz Exp $ */
+/* $NetBSD: pthread.c,v 1.106.2.5 2013/10/20 13:58:32 bouyer Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.106.2.4 2012/05/19 16:34:15 riz Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.106.2.5 2013/10/20 13:58:32 bouyer Exp $");
#define __EXPOSE_STACK 1
@@ -414,6 +414,7 @@ pthread_create(pthread_t *thread, const
flag |= LWP_SUSPENDED;
ret = _lwp_create(&newthread->pt_uc, flag, &newthread->pt_lid);
if (ret != 0) {
+ ret = errno;
free(name);
newthread->pt_state = PT_STATE_DEAD;
pthread_mutex_lock(&pthread__deadqueue_lock);
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:50:36 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.4 Log Message: Tickets 963, 967, 971, 972 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.0.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.2 src/doc/CHANGES-6.0.4:1.1.2.3 --- src/doc/CHANGES-6.0.4:1.1.2.2 Sat Oct 12 19:00:01 2013 +++ src/doc/CHANGES-6.0.4 Sun Oct 20 13:50:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.2 2013/10/12 19:00:01 jdc Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.3 2013/10/20 13:50:36 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -21,3 +21,30 @@ xsrc/xfree/xc/programs/Xserver/dix/dixfo references *c. [spz, ticket #966] +sys/arch/x86/pci/pci_machdep.c 1.61 via patch + + Force PCI mode 1 when running under QEMU, to work around + QEMU bug 897771. + This should also make it possible to boot NetBSD under versions of KVM + that have inherited said QEMU bug. Fixes PR kern/45671. + [gson, ticket #963] + +sys/netinet/tcp_usrreq.c 1.168 + + PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets + that don't have credentials yet. + [spz, ticket #967] + +external/mit/xorg/server/drivers/xf86-video-intel/Makefile 1.11 + + Add missing i810_dri.c file to SRCS. + PR xsrc/48315. + [martin, ticket #971] + +distrib/utils/sysinst/mbr.c 1.92 + + Add missing braces, which caused the offset of MBR partition 0 to be + unintentionally set to 2048 even on small (<=128GB) disks. + PR/48304. + [tsutsui, ticket #972] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:50:00 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.3 Log Message: Tickets 963, 967, 971, 972 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-6.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.2 src/doc/CHANGES-6.1.3:1.1.2.3 --- src/doc/CHANGES-6.1.3:1.1.2.2 Sat Oct 12 19:00:10 2013 +++ src/doc/CHANGES-6.1.3 Sun Oct 20 13:49:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.2 2013/10/12 19:00:10 jdc Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.3 2013/10/20 13:49:59 bouyer Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -21,3 +21,30 @@ xsrc/xfree/xc/programs/Xserver/dix/dixfo references *c. [spz, ticket #966] +sys/arch/x86/pci/pci_machdep.c 1.61 via patch + + Force PCI mode 1 when running under QEMU, to work around + QEMU bug 897771. + This should also make it possible to boot NetBSD under versions of KVM + that have inherited said QEMU bug. Fixes PR kern/45671. + [gson, ticket #963] + +sys/netinet/tcp_usrreq.c 1.168 + + PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets + that don't have credentials yet. + [spz, ticket #967] + +external/mit/xorg/server/drivers/xf86-video-intel/Makefile 1.11 + + Add missing i810_dri.c file to SRCS. + PR xsrc/48315. + [martin, ticket #971] + +distrib/utils/sysinst/mbr.c 1.92 + + Add missing braces, which caused the offset of MBR partition 0 to be + unintentionally set to 2048 even on small (<=128GB) disks. + PR/48304. + [tsutsui, ticket #972] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:48:56 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Tickets 956, 957, 958, 961, 962, 963, 964, 965, 967, 968, 970, 971, 972, 973. To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.54 src/doc/CHANGES-6.2:1.1.2.55 --- src/doc/CHANGES-6.2:1.1.2.54 Sat Oct 12 18:59:58 2013 +++ src/doc/CHANGES-6.2 Sun Oct 20 13:48:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.54 2013/10/12 18:59:58 jdc Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.55 2013/10/20 13:48:56 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -820,3 +820,118 @@ xsrc/xfree/xc/programs/Xserver/dix/dixfo references *c. [spz, ticket #966] +sys/dev/usb/if_aue.c1.131 + + Change one aprint_error_dev(9) to aprint_debug_dev(9) to avoid console + spam. + [tsutsui, ticket #956] + +sys/arch/i386/stand/lib/vbe.c 1.8 + + The 'vesa' command can take 'list' flag so mention it + in an error message. + [tsutsui, ticket #957] + +sys/arch/hp300/hp300/pmap_bootstrap.c 1.58 + + Fix a build error on a kernel config without 68040 machines. + [tsutsui, ticket #958] + +external/ibm-public/postfix/dist/HISTORY patch +external/ibm-public/postfix/dist/RELEASE_NOTES patch +external/ibm-public/postfix/dist/src/global/mail_version.h patch +external/ibm-public/postfix/dist/src/local/forward.c patch +external/ibm-public/postfix/dist/src/tls/tls_client.c patch +external/ibm-public/postfix/dist/src/tls/tls_server.c patch + + Update postfix to version 2.8.16: + - TLS Interoperability workaround: turn on SHA-2 digests by + force. This improves interoperability with clients and servers that + deploy SHA-2 digests without the required support for TLSv1.2-style + digest negotiation. + - TLS Performance workaround: the Postfix SMTP server TLS session + cache had become ineffective because recent OpenSSL versions enable + session tickets by default, resulting in a different ticket + encryption key for each smtpd(8) process. The workaround turns off + session tickets. Postfix 2.11 will enable session tickets properly. + - TLS Interoperability workaround: Debian Exim versions before 4.80-3 + may fail to communicate with Postfix and possibly other MTAs, with + the following Exim SMTP client error message: + TLS error on connection to server-name [server-address] + (gnutls_handshake): + + The Diffie-Hellman prime sent by the server is not acceptable + (not long enough) + + See the RELEASE_NOTES file for a Postfix SMTP server configuration + workaround. + - Bugfix (defect introduced: 1997): memory leak while forwarding mail + with the local(8) delivery agent, in code that handles a cleanup(8) + server error. + [tron, ticket #961] + +gnu/dist/texinfo/util/texi2dvi 1.10 + + Remove trailing whitespace in texi2dvi which confuses sed. + [riastradh, ticket #962] + +sys/arch/x86/pci/pci_machdep.c 1.61 via patch + + Force PCI mode 1 when running under QEMU, to work around + QEMU bug 897771. + This should also make it possible to boot NetBSD under versions of KVM + that have inherited said QEMU bug. Fixes PR kern/45671. + [gson, ticket #963] + +usr.sbin/eeprom/eehandlers.c 1.16 + + PR/47528: Izumi Tsutsui: eeprom(8) dumps core after 64 bit time_t + changes + [dholland, ticket #964] + +share/man/man4/man4.x86/vmt.4 1.4 +sys/arch/x86/x86/vmt.c1.8 + + Add periodic clock synchronization to vmt(4) so that the guest clock + remains synchronized even when the host is suspended (which is a very + typical situation in a laptop). + + Do this by default once per minute, but provide a sysctl to tune this + value (machdep.vmt0.clock_sync.period). + + [pettai, ticket #965] + +sys/netinet/tcp_usrreq.c 1.168 + + PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets + that don't have credentials yet. + [spz, ticket #967] + +usr.bin/systat/keyboard.c 1.25 + + Fix typo that made '?' an erase char instead of DEL as intended. + [dholland, ticket #968] + +sys/dev/i2c/w83795g.cpatch + + Make this driver compile on the netbsd-6 branch (fix ticket #929). + [simonb, ticket #970] + +external/mit/xorg/server/drivers/xf86-video-intel/Makefile 1.11 + + Add missing i810_dri.c file to SRCS. + PR xsrc/48315. + [martin, ticket #971] + +distrib/utils/sysinst/mbr.c 1.92 + + Add missing braces, which caused the offset of MBR partition 0 to be + unintentionally set to 2048 even on small (<=128GB) disks. + PR/48304. + [tsutsui, ticket #972] + +sys/arch/hp700/hp700/autoconf.c 1.51 + + Remember to unmap pagezero once we've finished with it. + [skrll, ticket #973] +
CVS commit: [netbsd-6] src/sys/arch/hp700/hp700
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:45:46 UTC 2013
Modified Files:
src/sys/arch/hp700/hp700 [netbsd-6]: autoconf.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #973):
sys/arch/hp700/hp700/autoconf.c: revision 1.51
Remember to unmap pagezero once we've finished with it. Found by gcc 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.1 -r1.44.2.2 src/sys/arch/hp700/hp700/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/autoconf.c
diff -u src/sys/arch/hp700/hp700/autoconf.c:1.44.2.1 src/sys/arch/hp700/hp700/autoconf.c:1.44.2.2
--- src/sys/arch/hp700/hp700/autoconf.c:1.44.2.1 Wed Aug 8 15:51:10 2012
+++ src/sys/arch/hp700/hp700/autoconf.c Sun Oct 20 13:45:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.44.2.1 2012/08/08 15:51:10 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.44.2.2 2013/10/20 13:45:46 bouyer Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@@ -86,7 +86,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.44.2.1 2012/08/08 15:51:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.44.2.2 2013/10/20 13:45:46 bouyer Exp $");
#include "opt_kgdb.h"
#include "opt_useleds.h"
@@ -474,6 +474,8 @@ cpu_rootconf(void)
}
printf("dp_flags 0x%x pz_class 0x%x\n", PAGE0->mem_boot.pz_dp.dp_flags,
PAGE0->mem_boot.pz_class);
+
+ hp700_pagezero_unmap(pagezero_cookie);
#endif /* DEBUG */
if (boot_device != NULL)
CVS commit: [netbsd-6] src/distrib/utils/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:43:17 UTC 2013
Modified Files:
src/distrib/utils/sysinst [netbsd-6]: mbr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #972):
distrib/utils/sysinst/mbr.c: revision 1.92
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (<=128GB) disks. Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.
To generate a diff of this commit:
cvs rdiff -u -r1.89.2.2 -r1.89.2.3 src/distrib/utils/sysinst/mbr.c
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/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89.2.2 src/distrib/utils/sysinst/mbr.c:1.89.2.3
--- src/distrib/utils/sysinst/mbr.c:1.89.2.2 Tue Jun 12 19:19:20 2012
+++ src/distrib/utils/sysinst/mbr.c Sun Oct 20 13:43:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
+/* $NetBSD: mbr.c,v 1.89.2.3 2013/10/20 13:43:17 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@ get_ptn_alignment(struct mbr_partition *
}
} else {
/* Use 1MB offset for large (>128GB) disks */
- if (dlsize > 2048 * 1024 * 128)
+ if (dlsize > 2048 * 1024 * 128) {
ptn_alignment = 2048;
ptn_0_offset = 2048;
+ }
}
}
CVS commit: [netbsd-6-0] src/distrib/utils/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:43:26 UTC 2013
Modified Files:
src/distrib/utils/sysinst [netbsd-6-0]: mbr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #972):
distrib/utils/sysinst/mbr.c: revision 1.92
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (<=128GB) disks. Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.
To generate a diff of this commit:
cvs rdiff -u -r1.89.2.2 -r1.89.2.2.4.1 src/distrib/utils/sysinst/mbr.c
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/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89.2.2 src/distrib/utils/sysinst/mbr.c:1.89.2.2.4.1
--- src/distrib/utils/sysinst/mbr.c:1.89.2.2 Tue Jun 12 19:19:20 2012
+++ src/distrib/utils/sysinst/mbr.c Sun Oct 20 13:43:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
+/* $NetBSD: mbr.c,v 1.89.2.2.4.1 2013/10/20 13:43:26 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@ get_ptn_alignment(struct mbr_partition *
}
} else {
/* Use 1MB offset for large (>128GB) disks */
- if (dlsize > 2048 * 1024 * 128)
+ if (dlsize > 2048 * 1024 * 128) {
ptn_alignment = 2048;
ptn_0_offset = 2048;
+ }
}
}
CVS commit: [netbsd-6-1] src/distrib/utils/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:43:23 UTC 2013
Modified Files:
src/distrib/utils/sysinst [netbsd-6-1]: mbr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #972):
distrib/utils/sysinst/mbr.c: revision 1.92
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (<=128GB) disks. Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.
To generate a diff of this commit:
cvs rdiff -u -r1.89.2.2 -r1.89.2.2.6.1 src/distrib/utils/sysinst/mbr.c
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/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89.2.2 src/distrib/utils/sysinst/mbr.c:1.89.2.2.6.1
--- src/distrib/utils/sysinst/mbr.c:1.89.2.2 Tue Jun 12 19:19:20 2012
+++ src/distrib/utils/sysinst/mbr.c Sun Oct 20 13:43:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
+/* $NetBSD: mbr.c,v 1.89.2.2.6.1 2013/10/20 13:43:23 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@ get_ptn_alignment(struct mbr_partition *
}
} else {
/* Use 1MB offset for large (>128GB) disks */
- if (dlsize > 2048 * 1024 * 128)
+ if (dlsize > 2048 * 1024 * 128) {
ptn_alignment = 2048;
ptn_0_offset = 2048;
+ }
}
}
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:40:00 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by martin in ticket #971): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.11 Add missing i810_dri.c file to SRCS. PR xsrc/48315. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.4.1 \ src/external/mit/xorg/server/drivers/xf86-video-intel/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-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10.4.1 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 Thu Aug 11 23:15:40 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun Oct 20 13:40:00 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ +# $NetBSD: Makefile,v 1.10.4.1 2013/10/20 13:40:00 bouyer Exp $ DRIVER= xf86-video-intel DRIVER_NAME= intel_drv SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c -SRCS+= i810_driver.c i810_io.c i810_memory.c i810_video.c +SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
CVS commit: [netbsd-6-0] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:40:10 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-6-0]: Makefile Log Message: Pull up following revision(s) (requested by martin in ticket #971): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.11 Add missing i810_dri.c file to SRCS. PR xsrc/48315. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.10.1 \ src/external/mit/xorg/server/drivers/xf86-video-intel/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-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10.10.1 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 Thu Aug 11 23:15:40 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun Oct 20 13:40:10 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ +# $NetBSD: Makefile,v 1.10.10.1 2013/10/20 13:40:10 bouyer Exp $ DRIVER= xf86-video-intel DRIVER_NAME= intel_drv SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c -SRCS+= i810_driver.c i810_io.c i810_memory.c i810_video.c +SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
CVS commit: [netbsd-6-1] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:40:07 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-6-1]: Makefile Log Message: Pull up following revision(s) (requested by martin in ticket #971): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.11 Add missing i810_dri.c file to SRCS. PR xsrc/48315. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.16.1 \ src/external/mit/xorg/server/drivers/xf86-video-intel/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-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10.16.1 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 Thu Aug 11 23:15:40 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun Oct 20 13:40:07 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ +# $NetBSD: Makefile,v 1.10.16.1 2013/10/20 13:40:07 bouyer Exp $ DRIVER= xf86-video-intel DRIVER_NAME= intel_drv SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c -SRCS+= i810_driver.c i810_io.c i810_memory.c i810_video.c +SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
CVS commit: [netbsd-6] src/sys/dev/i2c
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:36:43 UTC 2013 Modified Files: src/sys/dev/i2c [netbsd-6]: w83795g.c Log Message: apply patch, requested by simonb in ticket #970: sys/dev/i2c/w83795g.c patch Make this driver compile on the netbsd-6 branch (fix ticket #929). To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/i2c/w83795g.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/i2c/w83795g.c diff -u src/sys/dev/i2c/w83795g.c:1.1.2.2 src/sys/dev/i2c/w83795g.c:1.1.2.3 --- src/sys/dev/i2c/w83795g.c:1.1.2.2 Sat Aug 10 22:50:56 2013 +++ src/sys/dev/i2c/w83795g.c Sun Oct 20 13:36:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: w83795g.c,v 1.1.2.2 2013/08/10 22:50:56 riz Exp $ */ +/* $NetBSD: w83795g.c,v 1.1.2.3 2013/10/20 13:36:43 bouyer Exp $ */ /* * Copyright (c) 2013 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: w83795g.c,v 1.1.2.2 2013/08/10 22:50:56 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: w83795g.c,v 1.1.2.3 2013/10/20 13:36:43 bouyer Exp $"); #include #include @@ -231,7 +231,6 @@ w83795g_attach(device_t parent, device_t sc->sc_sensors[i].units = sensors[i].type; sc->sc_sensors[i].state = ENVSYS_SINVALID; sc->sc_sensors[i].flags = ENVSYS_FMONLIMITS; - sc->sc_sensors[i].flags |= ENVSYS_FHAS_ENTROPY; sc->sc_sensors[i].private = i; sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensors[i]); }
CVS commit: [netbsd-6] src/usr.bin/systat
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:32:45 UTC 2013
Modified Files:
src/usr.bin/systat [netbsd-6]: keyboard.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #968):
usr.bin/systat/keyboard.c: revision 1.25
No David, '\?' is not the del character. Broken in rev 1.21.
XXX pullup-5, pullup-6.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.28.1 src/usr.bin/systat/keyboard.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/systat/keyboard.c
diff -u src/usr.bin/systat/keyboard.c:1.24 src/usr.bin/systat/keyboard.c:1.24.28.1
--- src/usr.bin/systat/keyboard.c:1.24 Mon Dec 31 00:22:14 2007
+++ src/usr.bin/systat/keyboard.c Sun Oct 20 13:32:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $ */
+/* $NetBSD: keyboard.c,v 1.24.28.1 2013/10/20 13:32:45 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: keyboard.c,v 1.24 2007/12/31 00:22:14 christos Exp $");
+__RCSID("$NetBSD: keyboard.c,v 1.24.28.1 2013/10/20 13:32:45 bouyer Exp $");
#endif /* not lint */
#include
@@ -121,7 +121,7 @@ keyboard(void)
}
continue;
}
- if (ch == '\b' || ch == '\?' || ch == erasechar()) {
+ if (ch == '\b' || ch == '\177' || ch == erasechar()) {
if (col > 0)
col--;
goto doerase;
CVS commit: src/tests/lib/libc/tls_dso
Module Name:src
Committed By: joerg
Date: Sun Oct 20 13:30:50 UTC 2013
Modified Files:
src/tests/lib/libc/tls_dso: h_tls_dynamic.c
Log Message:
Force use of static TLS space.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/tls_dso/h_tls_dynamic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/tls_dso/h_tls_dynamic.c
diff -u src/tests/lib/libc/tls_dso/h_tls_dynamic.c:1.3 src/tests/lib/libc/tls_dso/h_tls_dynamic.c:1.4
--- src/tests/lib/libc/tls_dso/h_tls_dynamic.c:1.3 Tue Jan 17 20:34:57 2012
+++ src/tests/lib/libc/tls_dso/h_tls_dynamic.c Sun Oct 20 13:30:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: h_tls_dynamic.c,v 1.3 2012/01/17 20:34:57 joerg Exp $ */
+/* $NetBSD: h_tls_dynamic.c,v 1.4 2013/10/20 13:30:50 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__RCSID("$NetBSD: h_tls_dynamic.c,v 1.3 2012/01/17 20:34:57 joerg Exp $");
+__RCSID("$NetBSD: h_tls_dynamic.c,v 1.4 2013/10/20 13:30:50 joerg Exp $");
#include
#include
@@ -43,6 +43,7 @@ __RCSID("$NetBSD: h_tls_dynamic.c,v 1.3
__thread int var1 = 1;
__thread int var2;
+__attribute__((__tls_model__("initial-exec"))) __thread int var3;
__thread pid_t (*dso_var1)(void) = getpid;
@@ -53,4 +54,5 @@ testf_dso_helper(int x, int y)
{
var1 = x;
var2 = y;
+ var3 = x;
}
CVS commit: [netbsd-6-1] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:29:44 UTC 2013
Modified Files:
src/sys/netinet [netbsd-6-1]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #967):
sys/netinet/tcp_usrreq.c: revision 1.168
PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets that
don't have credentials yet.
XXX: pullup-6
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.1 -r1.162.2.1.6.1 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.162.2.1 src/sys/netinet/tcp_usrreq.c:1.162.2.1.6.1
--- src/sys/netinet/tcp_usrreq.c:1.162.2.1 Sat Mar 17 19:51:45 2012
+++ src/sys/netinet/tcp_usrreq.c Sun Oct 20 13:29:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.162.2.1.6.1 2013/10/20 13:29:44 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1.6.1 2013/10/20 13:29:44 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1168,18 +1168,20 @@ sysctl_net_inet_ip_ports(SYSCTLFN_ARGS)
static inline int
copyout_uid(struct socket *sockp, void *oldp, size_t *oldlenp)
{
- size_t sz;
- int error;
- uid_t uid;
-
- uid = kauth_cred_geteuid(sockp->so_cred);
if (oldp) {
+ size_t sz;
+ uid_t uid;
+ int error;
+
+ if (sockp->so_cred == NULL)
+ return EPERM;
+
+ uid = kauth_cred_geteuid(sockp->so_cred);
sz = MIN(sizeof(uid), *oldlenp);
- error = copyout(&uid, oldp, sz);
- if (error)
+ if ((error = copyout(&uid, oldp, sz)) != 0)
return error;
}
- *oldlenp = sizeof(uid);
+ *oldlenp = sizeof(uid_t);
return 0;
}
CVS commit: [netbsd-6-0] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:29:48 UTC 2013
Modified Files:
src/sys/netinet [netbsd-6-0]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #967):
sys/netinet/tcp_usrreq.c: revision 1.168
PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets that
don't have credentials yet.
XXX: pullup-6
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.1 -r1.162.2.1.4.1 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.162.2.1 src/sys/netinet/tcp_usrreq.c:1.162.2.1.4.1
--- src/sys/netinet/tcp_usrreq.c:1.162.2.1 Sat Mar 17 19:51:45 2012
+++ src/sys/netinet/tcp_usrreq.c Sun Oct 20 13:29:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.162.2.1.4.1 2013/10/20 13:29:48 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1.4.1 2013/10/20 13:29:48 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1168,18 +1168,20 @@ sysctl_net_inet_ip_ports(SYSCTLFN_ARGS)
static inline int
copyout_uid(struct socket *sockp, void *oldp, size_t *oldlenp)
{
- size_t sz;
- int error;
- uid_t uid;
-
- uid = kauth_cred_geteuid(sockp->so_cred);
if (oldp) {
+ size_t sz;
+ uid_t uid;
+ int error;
+
+ if (sockp->so_cred == NULL)
+ return EPERM;
+
+ uid = kauth_cred_geteuid(sockp->so_cred);
sz = MIN(sizeof(uid), *oldlenp);
- error = copyout(&uid, oldp, sz);
- if (error)
+ if ((error = copyout(&uid, oldp, sz)) != 0)
return error;
}
- *oldlenp = sizeof(uid);
+ *oldlenp = sizeof(uid_t);
return 0;
}
CVS commit: [netbsd-6] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:29:37 UTC 2013
Modified Files:
src/sys/netinet [netbsd-6]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #967):
sys/netinet/tcp_usrreq.c: revision 1.168
PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets that
don't have credentials yet.
XXX: pullup-6
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.1 -r1.162.2.2 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.162.2.1 src/sys/netinet/tcp_usrreq.c:1.162.2.2
--- src/sys/netinet/tcp_usrreq.c:1.162.2.1 Sat Mar 17 19:51:45 2012
+++ src/sys/netinet/tcp_usrreq.c Sun Oct 20 13:29:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.162.2.2 2013/10/20 13:29:37 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.1 2012/03/17 19:51:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162.2.2 2013/10/20 13:29:37 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1168,18 +1168,20 @@ sysctl_net_inet_ip_ports(SYSCTLFN_ARGS)
static inline int
copyout_uid(struct socket *sockp, void *oldp, size_t *oldlenp)
{
- size_t sz;
- int error;
- uid_t uid;
-
- uid = kauth_cred_geteuid(sockp->so_cred);
if (oldp) {
+ size_t sz;
+ uid_t uid;
+ int error;
+
+ if (sockp->so_cred == NULL)
+ return EPERM;
+
+ uid = kauth_cred_geteuid(sockp->so_cred);
sz = MIN(sizeof(uid), *oldlenp);
- error = copyout(&uid, oldp, sz);
- if (error)
+ if ((error = copyout(&uid, oldp, sz)) != 0)
return error;
}
- *oldlenp = sizeof(uid);
+ *oldlenp = sizeof(uid_t);
return 0;
}
CVS commit: [netbsd-6] src
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:28:20 UTC 2013
Modified Files:
src/share/man/man4/man4.x86 [netbsd-6]: vmt.4
src/sys/arch/x86/x86 [netbsd-6]: vmt.c
Log Message:
Pull up following revision(s) (requested by pettai in ticket #965):
sys/arch/x86/x86/vmt.c: revision 1.8
share/man/man4/man4.x86/vmt.4: revision 1.4
Synchronize the clock periodically in vmt(4).
Add periodic clock synchronization to vmt(4) so that the guest clock
remains synchronized even when the host is suspended (which is a very
typical situation in a laptop).
Do this by default once per minute, but provide a sysctl to tune this
value (machdep.vmt0.clock_sync.period).
Sent to tech-kern@ for review and addressed a couple of issues.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/share/man/man4/man4.x86/vmt.4
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/x86/x86/vmt.c
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/man4.x86/vmt.4
diff -u src/share/man/man4/man4.x86/vmt.4:1.3 src/share/man/man4/man4.x86/vmt.4:1.3.4.1
--- src/share/man/man4/man4.x86/vmt.4:1.3 Tue Oct 18 14:25:06 2011
+++ src/share/man/man4/man4.x86/vmt.4 Sun Oct 20 13:28:20 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: vmt.4,v 1.3 2011/10/18 14:25:06 wiz Exp $
+.\" $NetBSD: vmt.4,v 1.3.4.1 2013/10/20 13:28:20 bouyer Exp $
.\" $OpenBSD: vmt.4,v 1.4 2010/10/26 05:07:31 jmc Exp $
.\"
.\" Copyright (c) 2008 Marco Peereboom
@@ -15,7 +15,7 @@
.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
.\" ACTION OF CONTRACT, NEGLIGENCE OR TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd October 18, 2011
+.Dd March 16, 2013
.Dt VMT 4 x86
.Os
.Sh NAME
@@ -44,6 +44,25 @@ host.
.Pp
.Nm
reports the guest's hostname and first non-loopback IP address to the host.
+.Ss Clock synchronization
+The
+.Nm
+driver synchronizes the virtual machine's clock with the host clock in the
+following situations:
+.Bl -bullet
+.It
+When the virtual machine resumes after having been suspended.
+.It
+Periodically with the interval indicated by the
+.Va machdep.vmt0.clock_sync.period
+.Xr sysctl 8
+variable.
+This is done so that the virtual machine can keep its clock synchronized
+when the host is suspended, because in this case the
+.Nm
+driver receives no notification of such an event.
+Setting this tunable to zero disables clock synchronization.
+.El
.Sh SEE ALSO
.\" .Xr cpu 4 ,
.Xr powerd 8
Index: src/sys/arch/x86/x86/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.7 src/sys/arch/x86/x86/vmt.c:1.7.8.1
--- src/sys/arch/x86/x86/vmt.c:1.7 Fri Oct 21 10:10:28 2011
+++ src/sys/arch/x86/x86/vmt.c Sun Oct 20 13:28:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.7 2011/10/21 10:10:28 jmcneill Exp $ */
+/* $NetBSD: vmt.c,v 1.7.8.1 2013/10/20 13:28:20 bouyer Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
@@ -182,6 +183,7 @@ struct vmt_event {
struct vmt_softc {
device_t sc_dev;
+ struct sysctllog *sc_log;
struct vm_rpc sc_tclo_rpc;
bool sc_tclo_rpc_open;
char *sc_rpc_buf;
@@ -193,6 +195,10 @@ struct vmt_softc {
struct callout sc_tick;
struct callout sc_tclo_tick;
+#define VMT_CLOCK_SYNC_PERIOD_SECONDS 60
+ int sc_clock_sync_period_seconds;
+ struct callout sc_clock_sync_tick;
+
struct vmt_event sc_ev_power;
struct vmt_event sc_ev_reset;
struct vmt_event sc_ev_sleep;
@@ -204,6 +210,10 @@ struct vmt_softc {
CFATTACH_DECL_NEW(vmt, sizeof(struct vmt_softc),
vmt_match, vmt_attach, vmt_detach, NULL);
+static int vmt_sysctl_setup_root(device_t);
+static int vmt_sysctl_setup_clock_sync(device_t, const struct sysctlnode *);
+static int vmt_sysctl_update_clock_sync_period(SYSCTLFN_PROTO);
+
static void vm_cmd(struct vm_backdoor *);
static void vm_ins(struct vm_backdoor *);
static void vm_outs(struct vm_backdoor *);
@@ -230,6 +240,7 @@ static void vmt_sync_guest_clock(struct
static void vmt_tick(void *);
static void vmt_tclo_tick(void *);
+static void vmt_clock_sync_tick(void *);
static bool vmt_shutdown(device_t, int);
static void vmt_pswitch_event(void *);
@@ -294,14 +305,27 @@ vmt_type(void)
static void
vmt_attach(device_t parent, device_t self, void *aux)
{
+ int rv;
struct vmt_softc *sc = device_private(self);
aprint_naive("\n");
aprint_normal(": %s\n", vmt_type());
sc->sc_dev = self;
+ sc->sc_log = NULL;
+
callout_init(&sc->sc_tick, 0);
callout_init(&sc->sc_tclo_tick, 0);
+ callout_init(&sc->sc_clock_sync_tick, 0);
+
+ sc->sc_clock_sync_period_seconds = VMT_CLOCK_SYNC_PERIOD_SECONDS;
+
+ rv = vmt_sysctl_setup_root(self);
+ if (rv != 0) {
+ aprint_error_dev(self, "failed to initialize sysctl "
+ "(err %d)\n", rv);
+ goto free;
+ }
sc->sc_rpc_buf = kmem_alloc(VMT_RPC
CVS commit: [netbsd-6] src/usr.sbin/eeprom
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:25:02 UTC 2013
Modified Files:
src/usr.sbin/eeprom [netbsd-6]: eehandlers.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #964):
usr.sbin/eeprom/eehandlers.c: revision 1.16
PR/47528: Izumi Tsutsui: eeprom(8) dumps core after 64 bit time_t changes
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.8.1 src/usr.sbin/eeprom/eehandlers.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/eeprom/eehandlers.c
diff -u src/usr.sbin/eeprom/eehandlers.c:1.15 src/usr.sbin/eeprom/eehandlers.c:1.15.8.1
--- src/usr.sbin/eeprom/eehandlers.c:1.15 Thu Apr 30 07:45:28 2009
+++ src/usr.sbin/eeprom/eehandlers.c Sun Oct 20 13:25:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: eehandlers.c,v 1.15 2009/04/30 07:45:28 nakayama Exp $ */
+/* $NetBSD: eehandlers.c,v 1.15.8.1 2013/10/20 13:25:02 bouyer Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#ifdef __sparc__
@@ -140,6 +141,7 @@ ee_hwupdate(ktent, arg)
struct keytabent *ktent;
char *arg;
{
+ uint32_t hwtime;
time_t t;
char *cp, *cp2;
@@ -154,18 +156,26 @@ ee_hwupdate(ktent, arg)
} else
if ((t = parsedate(arg, NULL, NULL)) == (time_t)(-1))
BARF(ktent);
+ hwtime = (uint32_t)t; /* XXX 32 bit time_t on hardware */
+ if (hwtime != t)
+ warnx("time overflow");
- if (doio(ktent, (u_char *)&t, sizeof(t), IO_WRITE))
+ if (doio(ktent, (u_char *)&hwtime, sizeof(hwtime), IO_WRITE))
FAILEDWRITE(ktent);
- } else
- if (doio(ktent, (u_char *)&t, sizeof(t), IO_READ))
+ } else {
+ if (doio(ktent, (u_char *)&hwtime, sizeof(hwtime), IO_READ))
FAILEDREAD(ktent);
+ t = (time_t)hwtime; /* XXX 32 bit time_t on hardware */
+ }
cp = ctime(&t);
- if ((cp2 = strrchr(cp, '\n')) != NULL)
+ if (cp != NULL && (cp2 = strrchr(cp, '\n')) != NULL)
*cp2 = '\0';
- printf("%s=%ld (%s)\n", ktent->kt_keyword, (long)t, cp);
+ printf("%s=%" PRId64, ktent->kt_keyword, (int64_t)t);
+ if (cp != NULL)
+ printf(" (%s)", cp);
+ printf("\n");
}
void
CVS commit: [netbsd-6-1] src/sys/arch/x86/pci
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:18:50 UTC 2013
Modified Files:
src/sys/arch/x86/pci [netbsd-6-1]: pci_machdep.c
Log Message:
Apply patchm requested by gson in ticket #963:
sys/arch/x86/pci/pci_machdep.c 1.61 via patch
Force PCI mode 1 when running under QEMU, to work around
QEMU bug 897771.
This should also make it possible to boot NetBSD under versions of KVM
that have inherited said QEMU bug. Fixes PR kern/45671.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/arch/x86/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.54 src/sys/arch/x86/pci/pci_machdep.c:1.54.8.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.54 Wed Feb 15 16:30:29 2012
+++ src/sys/arch/x86/pci/pci_machdep.c Sun Oct 20 13:18:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.54.8.1 2013/10/20 13:18:50 bouyer Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54.8.1 2013/10/20 13:18:50 bouyer Exp $");
#include
#include
@@ -522,6 +522,7 @@ pci_mode_detect(void)
uint32_t sav, val;
int i;
pcireg_t idreg;
+ extern char cpu_brand_string[];
if (pci_mode != -1)
return pci_mode;
@@ -551,6 +552,13 @@ pci_mode_detect(void)
return (pci_mode);
}
}
+if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
+ /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
+#ifdef DEBUG
+ printf("forcing PCI mode 1 for QEMU\n");
+#endif
+ return (pci_mode);
+ }
/*
* Strong check for standard compliant mode 1:
CVS commit: [netbsd-6-0] src/sys/arch/x86/pci
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:18:48 UTC 2013
Modified Files:
src/sys/arch/x86/pci [netbsd-6-0]: pci_machdep.c
Log Message:
Apply patchm requested by gson in ticket #963:
sys/arch/x86/pci/pci_machdep.c 1.61 via patch
Force PCI mode 1 when running under QEMU, to work around
QEMU bug 897771.
This should also make it possible to boot NetBSD under versions of KVM
that have inherited said QEMU bug. Fixes PR kern/45671.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.6.1 src/sys/arch/x86/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.54 src/sys/arch/x86/pci/pci_machdep.c:1.54.6.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.54 Wed Feb 15 16:30:29 2012
+++ src/sys/arch/x86/pci/pci_machdep.c Sun Oct 20 13:18:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.54.6.1 2013/10/20 13:18:48 bouyer Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54.6.1 2013/10/20 13:18:48 bouyer Exp $");
#include
#include
@@ -522,6 +522,7 @@ pci_mode_detect(void)
uint32_t sav, val;
int i;
pcireg_t idreg;
+ extern char cpu_brand_string[];
if (pci_mode != -1)
return pci_mode;
@@ -551,6 +552,13 @@ pci_mode_detect(void)
return (pci_mode);
}
}
+if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
+ /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
+#ifdef DEBUG
+ printf("forcing PCI mode 1 for QEMU\n");
+#endif
+ return (pci_mode);
+ }
/*
* Strong check for standard compliant mode 1:
CVS commit: [netbsd-6] src/sys/arch/x86/pci
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 13:16:57 UTC 2013
Modified Files:
src/sys/arch/x86/pci [netbsd-6]: pci_machdep.c
Log Message:
Apply patch, requested by riastradh in ticket #962:
sys/arch/x86/pci/pci_machdep.c 1.61 via patch
Force PCI mode 1 when running under QEMU, to work around
QEMU bug 897771.
This should also make it possible to boot NetBSD under versions of KVM
that have inherited said QEMU bug. Fixes PR kern/45671.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/arch/x86/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.54 src/sys/arch/x86/pci/pci_machdep.c:1.54.2.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.54 Wed Feb 15 16:30:29 2012
+++ src/sys/arch/x86/pci/pci_machdep.c Sun Oct 20 13:16:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.54.2.1 2013/10/20 13:16:57 bouyer Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54.2.1 2013/10/20 13:16:57 bouyer Exp $");
#include
#include
@@ -522,6 +522,7 @@ pci_mode_detect(void)
uint32_t sav, val;
int i;
pcireg_t idreg;
+ extern char cpu_brand_string[];
if (pci_mode != -1)
return pci_mode;
@@ -551,6 +552,13 @@ pci_mode_detect(void)
return (pci_mode);
}
}
+if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
+ /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
+#ifdef DEBUG
+ printf("forcing PCI mode 1 for QEMU\n");
+#endif
+ return (pci_mode);
+ }
/*
* Strong check for standard compliant mode 1:
CVS commit: [netbsd-6] src/gnu/dist/texinfo/util
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:14:31 UTC 2013 Modified Files: src/gnu/dist/texinfo/util [netbsd-6]: texi2dvi Log Message: Pull up following revision(s) (requested by riastradh in ticket #962): gnu/dist/texinfo/util/texi2dvi: revision 1.10 Remove trailing whitespace in texi2dvi which confuses sed. XXX pull up to 5, 6? To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.20.1 src/gnu/dist/texinfo/util/texi2dvi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/texinfo/util/texi2dvi diff -u src/gnu/dist/texinfo/util/texi2dvi:1.9 src/gnu/dist/texinfo/util/texi2dvi:1.9.20.1 --- src/gnu/dist/texinfo/util/texi2dvi:1.9 Tue Sep 2 08:00:24 2008 +++ src/gnu/dist/texinfo/util/texi2dvi Sun Oct 20 13:14:31 2013 @@ -605,10 +605,10 @@ $textra" "$filename_input" >"$filename_x # If this is a Texinfo file with a specified input encoding, and # recode is available, then recode to plain 7 bit Texinfo. if test $language = texinfo; then -pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ - t found - d - :found +pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ + t found + d + :found q' encoding=`sed -e "$pgm" "$filename_input"` if $recode && test -n "$encoding" && findprog recode; then
CVS commit: [netbsd-6] src/external/ibm-public/postfix/dist
Module Name:src Committed By: bouyer Date: Sun Oct 20 12:58:26 UTC 2013 Modified Files: src/external/ibm-public/postfix/dist [netbsd-6]: HISTORY RELEASE_NOTES src/external/ibm-public/postfix/dist/src/global [netbsd-6]: mail_version.h src/external/ibm-public/postfix/dist/src/local [netbsd-6]: forward.c src/external/ibm-public/postfix/dist/src/tls [netbsd-6]: tls_client.c tls_server.c Log Message: Apply patch, requested by tron in ticket #961: external/ibm-public/postfix/dist/HISTORYpatch external/ibm-public/postfix/dist/RELEASE_NOTES patch external/ibm-public/postfix/dist/src/global/mail_version.h patch external/ibm-public/postfix/dist/src/local/forward.cpatch external/ibm-public/postfix/dist/src/tls/tls_client.c patch external/ibm-public/postfix/dist/src/tls/tls_server.c patch Update postfix to version 2.8.16: - TLS Interoperability workaround: turn on SHA-2 digests by force. This improves interoperability with clients and servers that deploy SHA-2 digests without the required support for TLSv1.2-style digest negotiation. - TLS Performance workaround: the Postfix SMTP server TLS session cache had become ineffective because recent OpenSSL versions enable session tickets by default, resulting in a different ticket encryption key for each smtpd(8) process. The workaround turns off session tickets. Postfix 2.11 will enable session tickets properly. - TLS Interoperability workaround: Debian Exim versions before 4.80-3 may fail to communicate with Postfix and possibly other MTAs, with the following Exim SMTP client error message: TLS error on connection to server-name [server-address] (gnutls_handshake): The Diffie-Hellman prime sent by the server is not acceptable (not long enough) See the RELEASE_NOTES file for a Postfix SMTP server configuration workaround. - Bugfix (defect introduced: 1997): memory leak while forwarding mail with the local(8) delivery agent, in code that handles a cleanup(8) server error. To generate a diff of this commit: cvs rdiff -u -r1.1.1.12.2.5 -r1.1.1.12.2.6 \ src/external/ibm-public/postfix/dist/HISTORY cvs rdiff -u -r1.1.1.6.6.1 -r1.1.1.6.6.2 \ src/external/ibm-public/postfix/dist/RELEASE_NOTES cvs rdiff -u -r1.1.1.12.2.5 -r1.1.1.12.2.6 \ src/external/ibm-public/postfix/dist/src/global/mail_version.h cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \ src/external/ibm-public/postfix/dist/src/local/forward.c cvs rdiff -u -r1.4.6.1 -r1.4.6.2 \ src/external/ibm-public/postfix/dist/src/tls/tls_client.c \ src/external/ibm-public/postfix/dist/src/tls/tls_server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/HISTORY diff -u src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.5 src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.6 --- src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.5 Sat Sep 7 16:28:34 2013 +++ src/external/ibm-public/postfix/dist/HISTORY Sun Oct 20 12:58:25 2013 @@ -16915,3 +16915,26 @@ Apologies for any names omitted. between different hostnames that resolve to the same IP address. Found during Postfix 2.11 code maintenance. File: smtp/smtp_connect.c. + +20130518 + + Bugfix (introduced: 1997): memory leak after error while + forwarding mail through the cleanup server. Viktor found + one, Wietse eliminated the rest. File: local/forward.c. + +20130615 + + TLS Interoperability: turn on SHA-2 digests by force. This + improves interoperability with clients and servers that + deploy SHA-2 digests without the required support for + TLSv1.2-style digest negotiation. Based on patch by Viktor + Dukhovni. Files: tls/tls_client.c, tls/tls_server.c. + +20130616 + + Workaround: The Postfix SMTP server TLS session cache was + broken because OpenSSL now enables session tickets by + default, resulting in a different ticket encryption key for + each smtpd(8) process. The workaround turns off session + tickets. In 2.11 we'll enable session tickets properly. + Viktor Dukhovni. File: tls/tls_server.c. Index: src/external/ibm-public/postfix/dist/RELEASE_NOTES diff -u src/external/ibm-public/postfix/dist/RELEASE_NOTES:1.1.1.6.6.1 src/external/ibm-public/postfix/dist/RELEASE_NOTES:1.1.1.6.6.2 --- src/external/ibm-public/postfix/dist/RELEASE_NOTES:1.1.1.6.6.1 Wed Jun 13 19:28:56 2012 +++ src/external/ibm-public/postfix/dist/RELEASE_NOTES Sun Oct 20 12:58:25 2013 @@ -11,6 +11,36 @@ instead, a new snapshot is released. The mail_release_date configuration parameter (format: mmdd) specifies the release date of a stable release or snapshot release. +Deb
CVS commit: [netbsd-6] src/sys/arch/hp300/hp300
Module Name:src Committed By: bouyer Date: Sun Oct 20 12:52:42 UTC 2013 Modified Files: src/sys/arch/hp300/hp300 [netbsd-6]: pmap_bootstrap.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #958): sys/arch/hp300/hp300/pmap_bootstrap.c: revision 1.58 Fix a build error on a kernel config without 68040 machines. Reported by Andrew Gillham on port-hp300@: http://mail-index.NetBSD.org/port-hp300/2013/09/09/msg77.html (I removed defined(68060) since hp300 doesn't have it) Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/hp300/hp300/pmap_bootstrap.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/hp300/hp300/pmap_bootstrap.c diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57.2.1 --- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 Fri Feb 10 06:28:39 2012 +++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sun Oct 20 12:52:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.57.2.1 2013/10/20 12:52:42 bouyer Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57.2.1 2013/10/20 12:52:42 bouyer Exp $"); #include #include @@ -411,8 +411,10 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f */ RELOC(Sysseg, st_entry_t *) = (st_entry_t *)(kstpa - firstpa); RELOC(Sysseg_pa, paddr_t) = kstpa; +#if defined(M68040) if (RELOC(mmutype, int) == MMU_68040) RELOC(protostfree, u_int) = stfree; +#endif /* * Sysptmap: base of kernel page table map */
CVS commit: [netbsd-6] src/sys/arch/i386/stand/lib
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 12:51:10 UTC 2013
Modified Files:
src/sys/arch/i386/stand/lib [netbsd-6]: vbe.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #957):
sys/arch/i386/stand/lib/vbe.c: revision 1.8
The 'vesa' command can take 'list' flag so mention it in an error message.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.10.1 src/sys/arch/i386/stand/lib/vbe.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/i386/stand/lib/vbe.c
diff -u src/sys/arch/i386/stand/lib/vbe.c:1.7 src/sys/arch/i386/stand/lib/vbe.c:1.7.10.1
--- src/sys/arch/i386/stand/lib/vbe.c:1.7 Wed Feb 9 04:37:54 2011
+++ src/sys/arch/i386/stand/lib/vbe.c Sun Oct 20 12:51:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vbe.c,v 1.7 2011/02/09 04:37:54 jmcneill Exp $ */
+/* $NetBSD: vbe.c,v 1.7.10.1 2013/10/20 12:51:10 bouyer Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill
@@ -414,6 +414,6 @@ command_vesa(char *cmd)
return;
}
- printf("invalid flag, must be 'on', 'off', "
+ printf("invalid flag, must be 'on', 'off', 'list', "
"a display mode, or a VBE mode number\n");
}
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 12:49:33 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-6]: if_aue.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #956):
sys/dev/usb/if_aue.c: revision 1.131
Change one aprint_error_dev(9) to aprint_debug_dev(9) to avoid console spam.
My aue (BUFFALO LUA2-TX) generates a bunch of
"aue0: 1 usb errors on intr: IOERROR" errors during TRX,
but works without visible problems.
XXX this is not autoconf(9) message
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.124.2.1 src/sys/dev/usb/if_aue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.124 src/sys/dev/usb/if_aue.c:1.124.2.1
--- src/sys/dev/usb/if_aue.c:1.124 Thu Feb 2 19:43:07 2012
+++ src/sys/dev/usb/if_aue.c Sun Oct 20 12:49:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.124 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_aue.c,v 1.124.2.1 2013/10/20 12:49:33 bouyer Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul . All rights reserved.
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.124 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.124.2.1 2013/10/20 12:49:33 bouyer Exp $");
#include "opt_inet.h"
@@ -1070,7 +1070,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_pri
}
sc->aue_intr_errs++;
if (usbd_ratecheck(&sc->aue_rx_notice)) {
- aprint_error_dev(sc->aue_dev,
+ aprint_debug_dev(sc->aue_dev,
"%u usb errors on intr: %s\n", sc->aue_intr_errs,
usbd_errstr(status));
sc->aue_intr_errs = 0;
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 11:37:53 UTC 2013
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
Fix memory leak if the provided mac address isn't valid.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/xen/xen/xennetback_xenbus.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/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.51 src/sys/arch/xen/xen/xennetback_xenbus.c:1.52
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.51 Wed Mar 6 11:37:23 2013
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Sun Oct 20 11:37:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.51 2013/03/06 11:37:23 yamt Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.52 2013/10/20 11:37:53 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.51 2013/03/06 11:37:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.52 2013/10/20 11:37:53 bouyer Exp $");
#include "opt_xen.h"
@@ -288,6 +288,7 @@ xennetback_xenbus_create(struct xenbus_d
if ((e[0] == '\0' && i != 5) && e[0] != ':') {
aprint_error_ifnet(ifp,
"%s is not a valid mac address\n", val);
+ free(val, M_DEVBUF);
err = EINVAL;
goto fail;
}
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Sun Oct 20 11:37:11 UTC 2013
Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c
Log Message:
Add more XENPRINTF() to xbdback_connect()
in xbdback_backend_changed(), fix memory leak.
Do not free an uninitialized pointer in xbdback_connect(). Should fix
hypervisor or dom0 reboot when using windows PV drivers, as reported
by several users on port-xen.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.57 src/sys/arch/xen/xen/xbdback_xenbus.c:1.58
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.57 Mon Jul 23 01:31:01 2012
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sun Oct 20 11:37:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.57 2012/07/23 01:31:01 jym Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.58 2013/10/20 11:37:11 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.57 2012/07/23 01:31:01 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.58 2013/10/20 11:37:11 bouyer Exp $");
#include
#include
@@ -530,6 +530,7 @@ xbdback_connect(struct xbdback_instance
const char *proto;
struct xenbus_device *xbusd = xbdi->xbdi_xbusd;
+ XENPRINTF(("xbdback %s: connect\n", xbusd->xbusd_path));
/* read comunication informations */
err = xenbus_read_ul(NULL, xbusd->xbusd_otherend,
"ring-ref", &ring_ref, 10);
@@ -538,6 +539,7 @@ xbdback_connect(struct xbdback_instance
xbusd->xbusd_otherend);
return -1;
}
+ XENPRINTF(("xbdback %s: connect ring-ref %lu\n", xbusd->xbusd_path, ring_ref));
err = xenbus_read_ul(NULL, xbusd->xbusd_otherend,
"event-channel", &revtchn, 10);
if (err) {
@@ -545,12 +547,15 @@ xbdback_connect(struct xbdback_instance
xbusd->xbusd_otherend);
return -1;
}
+ XENPRINTF(("xbdback %s: connect revtchn %lu\n", xbusd->xbusd_path, revtchn));
err = xenbus_read(NULL, xbusd->xbusd_otherend, "protocol",
&len, &xsproto);
if (err) {
xbdi->xbdi_proto = XBDIP_NATIVE;
proto = "unspecified";
+ XENPRINTF(("xbdback %s: connect no xsproto\n", xbusd->xbusd_path));
} else {
+ XENPRINTF(("xbdback %s: connect xsproto %s\n", xbusd->xbusd_path, xsproto));
if (strcmp(xsproto, XEN_IO_PROTO_ABI_NATIVE) == 0) {
xbdi->xbdi_proto = XBDIP_NATIVE;
proto = XEN_IO_PROTO_ABI_NATIVE;
@@ -566,8 +571,8 @@ xbdback_connect(struct xbdback_instance
free(xsproto, M_DEVBUF);
return -1;
}
+ free(xsproto, M_DEVBUF);
}
- free(xsproto, M_DEVBUF);
/* allocate VA space and map rings */
xbdi->xbdi_ring_va = uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
@@ -577,6 +582,7 @@ xbdback_connect(struct xbdback_instance
"can't get VA for ring", xbusd->xbusd_otherend);
return -1;
}
+ XENPRINTF(("xbdback %s: connect va 0x%" PRIxVADDR "\n", xbusd->xbusd_path, xbdi->xbdi_ring_va));
grop.host_addr = xbdi->xbdi_ring_va;
grop.flags = GNTMAP_host_map;
@@ -592,6 +598,7 @@ xbdback_connect(struct xbdback_instance
goto err;
}
xbdi->xbdi_ring_handle = grop.handle;
+ XENPRINTF(("xbdback %s: connect grhandle %d\n", xbusd->xbusd_path, grop.handle));
switch(xbdi->xbdi_proto) {
case XBDIP_NATIVE:
@@ -626,6 +633,7 @@ xbdback_connect(struct xbdback_instance
"can't bind event channel", xbusd->xbusd_otherend);
goto err2;
}
+ XENPRINTF(("xbdback %s: connect evchannel %d\n", xbusd->xbusd_path, xbdi->xbdi_evtchn));
xbdi->xbdi_evtchn = evop.u.bind_interdomain.local_port;
event_set_handler(xbdi->xbdi_evtchn, xbdback_evthandler,
@@ -765,6 +773,7 @@ xbdback_backend_changed(struct xenbus_wa
xbdi->xbdi_ro = false;
else
xbdi->xbdi_ro = true;
+ free(mode, M_DEVBUF);
major = major(xbdi->xbdi_dev);
devname = devsw_blk2name(major);
if (devname == NULL) {
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sun Oct 20 09:30:41 UTC 2013 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Use cpuctrlmask in the arm1[01] case. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/arch/arm/arm/cpufunc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/cpufunc.c diff -u src/sys/arch/arm/arm/cpufunc.c:1.125 src/sys/arch/arm/arm/cpufunc.c:1.126 --- src/sys/arch/arm/arm/cpufunc.c:1.125 Sun Aug 18 07:57:27 2013 +++ src/sys/arch/arm/arm/cpufunc.c Sun Oct 20 09:30:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.c,v 1.125 2013/08/18 07:57:27 matt Exp $ */ +/* $NetBSD: cpufunc.c,v 1.126 2013/10/20 09:30:41 skrll Exp $ */ /* * arm7tdmi support code Copyright (c) 2001 John Fremlin @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.125 2013/08/18 07:57:27 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.126 2013/10/20 09:30:41 skrll Exp $"); #include "opt_compat_netbsd.h" #include "opt_cpuoptions.h" @@ -2871,7 +2871,7 @@ arm10_setup(char *args) /* Set the control register */ curcpu()->ci_ctrl = cpuctrl; - cpu_control(0x, cpuctrl); + cpu_control(cpuctrlmask, cpuctrl); /* And again. */ cpu_idcache_wbinv_all(); @@ -2930,7 +2930,7 @@ arm11_setup(char *args) /* Set the control register */ curcpu()->ci_ctrl = cpuctrl; - cpu_control(0x, cpuctrl); + cpu_control(cpuctrlmask, cpuctrl); /* And again. */ cpu_idcache_wbinv_all();
