Re: svn commit: r267364 - head/sys/vm
On 06/12/2014 18:46, Adrian Chadd wrote:
Hi!
Wouldn't this also be fixed if popmap_t was a unsigned char (to match
what setbit/clrbit/etc do) and then use the existing macros?
Is there any reason popmap_t is not a uchar ? Is it ever accessed as
anything other than an array of chars?
Yes, there is. Parts of the code that you don't see in the below change
make heavy use of ffsl() on the population map.
On 11 June 2014 11:11, Alan Cox a...@freebsd.org wrote:
Author: alc
Date: Wed Jun 11 16:11:12 2014
New Revision: 267364
URL: http://svnweb.freebsd.org/changeset/base/267364
Log:
Correct a bug in the management of the population map on big-endian
machines. Specifically, there was a mismatch between how the routine
allocation and deallocation operations accessed the population map
and how the aggressively optimized reservation-breaking operation
accessed it. So, problems only occurred when reservations were broken.
This change makes the routine operations access the population map in
the same way as the reservation breaking operation.
This bug was introduced in r25.
PR: 187080
Tested by:jmg (on an armeb machine)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/vm/vm_reserv.c
Modified: head/sys/vm/vm_reserv.c
==
--- head/sys/vm/vm_reserv.c Wed Jun 11 14:53:58 2014(r267363)
+++ head/sys/vm/vm_reserv.c Wed Jun 11 16:11:12 2014(r267364)
@@ -108,6 +108,46 @@ typedefu_long popmap_t;
#defineNPOPMAP howmany(VM_LEVEL_0_NPAGES, NBPOPMAP)
/*
+ * Clear a bit in the population map.
+ */
+static __inline void
+popmap_clear(popmap_t popmap[], int i)
+{
+
+ popmap[i / NBPOPMAP] = ~(1UL (i % NBPOPMAP));
+}
+
+/*
+ * Set a bit in the population map.
+ */
+static __inline void
+popmap_set(popmap_t popmap[], int i)
+{
+
+ popmap[i / NBPOPMAP] |= 1UL (i % NBPOPMAP);
+}
+
+/*
+ * Is a bit in the population map clear?
+ */
+static __inline boolean_t
+popmap_is_clear(popmap_t popmap[], int i)
+{
+
+ return ((popmap[i / NBPOPMAP] (1UL (i % NBPOPMAP))) == 0);
+}
+
+/*
+ * Is a bit in the population map set?
+ */
+static __inline boolean_t
+popmap_is_set(popmap_t popmap[], int i)
+{
+
+ return ((popmap[i / NBPOPMAP] (1UL (i % NBPOPMAP))) != 0);
+}
+
+/*
* The reservation structure
*
* A reservation structure is constructed whenever a large physical page is
@@ -241,7 +281,7 @@ vm_reserv_depopulate(vm_reserv_t rv, int
mtx_assert(vm_page_queue_free_mtx, MA_OWNED);
KASSERT(rv-object != NULL,
(vm_reserv_depopulate: reserv %p is free, rv));
- KASSERT(isset(rv-popmap, index),
+ KASSERT(popmap_is_set(rv-popmap, index),
(vm_reserv_depopulate: reserv %p's popmap[%d] is clear, rv,
index));
KASSERT(rv-popcnt 0,
@@ -255,7 +295,7 @@ vm_reserv_depopulate(vm_reserv_t rv, int
rv));
rv-pages-psind = 0;
}
- clrbit(rv-popmap, index);
+ popmap_clear(rv-popmap, index);
rv-popcnt--;
if (rv-popcnt == 0) {
LIST_REMOVE(rv, objq);
@@ -302,7 +342,7 @@ vm_reserv_populate(vm_reserv_t rv, int i
mtx_assert(vm_page_queue_free_mtx, MA_OWNED);
KASSERT(rv-object != NULL,
(vm_reserv_populate: reserv %p is free, rv));
- KASSERT(isclr(rv-popmap, index),
+ KASSERT(popmap_is_clear(rv-popmap, index),
(vm_reserv_populate: reserv %p's popmap[%d] is set, rv,
index));
KASSERT(rv-popcnt VM_LEVEL_0_NPAGES,
@@ -313,7 +353,7 @@ vm_reserv_populate(vm_reserv_t rv, int i
TAILQ_REMOVE(vm_rvq_partpop, rv, partpopq);
rv-inpartpopq = FALSE;
}
- setbit(rv-popmap, index);
+ popmap_set(rv-popmap, index);
rv-popcnt++;
if (rv-popcnt VM_LEVEL_0_NPAGES) {
rv-inpartpopq = TRUE;
@@ -503,7 +543,7 @@ found:
return (NULL);
/* Handle vm_page_rename(m, new_object, ...). */
for (i = 0; i npages; i++)
- if (isset(rv-popmap, index + i))
+ if (popmap_is_set(rv-popmap, index + i))
return (NULL);
for (i = 0; i npages; i++)
vm_reserv_populate(rv, index + i);
@@ -628,7 +668,7 @@ found:
index = VM_RESERV_INDEX(object, pindex);
m = rv-pages[index];
/* Handle vm_page_rename(m, new_object, ...). */
- if (isset(rv-popmap, index))
+ if (popmap_is_set(rv-popmap, index))
return (NULL);
vm_reserv_populate(rv, index);
return (m);
@@ -662,9 +702,9 @@ vm_reserv_break(vm_reserv_t rv, vm_page_
* to the physical memory allocator.
*/
svn commit: r267434 - stable/8/etc/namedb
Author: erwin Date: Fri Jun 13 07:23:46 2014 New Revision: 267434 URL: http://svnweb.freebsd.org/changeset/base/267434 Log: Sync with 2014060201 which adds IPv6 to b.root-servers.net Note that this is a direct commit to stable/8 as this file is no longer in HEAD. Sponsored by: DK Hostmaster A/S Modified: stable/8/etc/namedb/named.root Modified: stable/8/etc/namedb/named.root == --- stable/8/etc/namedb/named.root Fri Jun 13 00:07:32 2014 (r267433) +++ stable/8/etc/namedb/named.root Fri Jun 13 07:23:46 2014 (r267434) @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR-RS.INTERNIC.NET ; -; last update:Mar 26, 2014 -; related version of root zone: 2014032601 +; last update:June 2, 2014 +; related version of root zone: 2014060201 ; ; formerly NS.INTERNIC.NET ; @@ -26,6 +26,7 @@ A.ROOT-SERVERS.NET. 360 AA ; .360 NSB.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 360 A 192.228.79.201 +B.ROOT-SERVERS.NET. 360 2001:500:84::B ; ; FORMERLY C.PSI.NET ; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267435 - stable/10/lib/libusb
Author: hselasky
Date: Fri Jun 13 07:33:43 2014
New Revision: 267435
URL: http://svnweb.freebsd.org/changeset/base/267435
Log:
MFC r263191:
Add libusb_log_level enum.
Modified:
stable/10/lib/libusb/libusb.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libusb/libusb.h
==
--- stable/10/lib/libusb/libusb.h Fri Jun 13 07:23:46 2014
(r267434)
+++ stable/10/lib/libusb/libusb.h Fri Jun 13 07:33:43 2014
(r267435)
@@ -194,6 +194,19 @@ enum libusb_transfer_flags {
LIBUSB_TRANSFER_FREE_TRANSFER = 1 2,
};
+enum libusb_log_level {
+ LIBUSB_LOG_LEVEL_NONE = 0,
+ LIBUSB_LOG_LEVEL_ERROR,
+ LIBUSB_LOG_LEVEL_WARNING,
+ LIBUSB_LOG_LEVEL_INFO,
+ LIBUSB_LOG_LEVEL_DEBUG
+};
+
+/* XXX */
+/* libusb_set_debug should take parameters from libusb_log_level
+ * above according to
+ * http://libusb.sourceforge.net/api-1.0/group__lib.html
+ */
enum libusb_debug_level {
LIBUSB_DEBUG_NO=0,
LIBUSB_DEBUG_FUNCTION=1,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267436 - head/lib/libiconv_modules/HZ
Author: tijl
Date: Fri Jun 13 08:26:53 2014
New Revision: 267436
URL: http://svnweb.freebsd.org/changeset/base/267436
Log:
Replace malloc+memset with calloc.
Modified:
head/lib/libiconv_modules/HZ/citrus_hz.c
Modified: head/lib/libiconv_modules/HZ/citrus_hz.c
==
--- head/lib/libiconv_modules/HZ/citrus_hz.cFri Jun 13 07:33:43 2014
(r267435)
+++ head/lib/libiconv_modules/HZ/citrus_hz.cFri Jun 13 08:26:53 2014
(r267436)
@@ -532,10 +532,9 @@ _citrus_HZ_parse_graphic(void *context,
p = (void **)context;
escape = (escape_t *)p[0];
ei = (_HZEncodingInfo *)p[1];
- graphic = malloc(sizeof(*graphic));
+ graphic = calloc(1, sizeof(*graphic));
if (graphic == NULL)
return (ENOMEM);
- memset(graphic, 0, sizeof(*graphic));
if (strcmp(GL, name) == 0) {
if (GL(escape) != NULL)
goto release;
@@ -598,10 +597,9 @@ _citrus_HZ_parse_escape(void *context, c
void *p[2];
ei = (_HZEncodingInfo *)context;
- escape = malloc(sizeof(*escape));
+ escape = calloc(1, sizeof(*escape));
if (escape == NULL)
return (EINVAL);
- memset(escape, 0, sizeof(*escape));
if (strcmp(0, name) == 0) {
escape-set = E0SET(ei);
TAILQ_INSERT_TAIL(E0SET(ei), escape, entry);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267437 - head/lib/libc/iconv
Author: tijl
Date: Fri Jun 13 08:28:51 2014
New Revision: 267437
URL: http://svnweb.freebsd.org/changeset/base/267437
Log:
Replace malloc+memset with calloc.
Modified:
head/lib/libc/iconv/citrus_db_factory.c
head/lib/libc/iconv/citrus_iconv.c
Modified: head/lib/libc/iconv/citrus_db_factory.c
==
--- head/lib/libc/iconv/citrus_db_factory.c Fri Jun 13 08:26:53 2014
(r267436)
+++ head/lib/libc/iconv/citrus_db_factory.c Fri Jun 13 08:28:51 2014
(r267437)
@@ -270,11 +270,9 @@ _citrus_db_factory_serialize(struct _cit
return (0);
}
/* allocate hash table */
- depp = malloc(sizeof(*depp) * df-df_num_entries);
+ depp = calloc(df-df_num_entries, sizeof(*depp));
if (depp == NULL)
return (-1);
- for (i = 0; i df-df_num_entries; i++)
- depp[i] = NULL;
/* step1: store the entries which are not conflicting */
STAILQ_FOREACH(de, df-df_entries, de_entry) {
Modified: head/lib/libc/iconv/citrus_iconv.c
==
--- head/lib/libc/iconv/citrus_iconv.c Fri Jun 13 08:26:53 2014
(r267436)
+++ head/lib/libc/iconv/citrus_iconv.c Fri Jun 13 08:28:51 2014
(r267437)
@@ -344,9 +344,8 @@ const char
{
char *buf;
- if ((buf = malloc((size_t)PATH_MAX)) == NULL)
+ if ((buf = calloc((size_t)PATH_MAX, sizeof(*buf))) == NULL)
return (NULL);
- memset((void *)buf, 0, (size_t)PATH_MAX);
_citrus_esdb_alias(name, buf, (size_t)PATH_MAX);
return (buf);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267438 - head/lib/libc/iconv
Author: tijl
Date: Fri Jun 13 08:36:10 2014
New Revision: 267438
URL: http://svnweb.freebsd.org/changeset/base/267438
Log:
iconv_open: initialise ci_ilseq_invalid field of _citrus_iconv_shared
struct after allocation with malloc.
iconvlist: reduce a memory leak by copying strings only once.
Modified:
head/lib/libc/iconv/bsd_iconv.c
Modified: head/lib/libc/iconv/bsd_iconv.c
==
--- head/lib/libc/iconv/bsd_iconv.c Fri Jun 13 08:28:51 2014
(r267437)
+++ head/lib/libc/iconv/bsd_iconv.c Fri Jun 13 08:36:10 2014
(r267438)
@@ -83,6 +83,7 @@ __bsd___iconv_open(const char *out, cons
}
handle-cv_shared-ci_discard_ilseq = strcasestr(out, //IGNORE);
+ handle-cv_shared-ci_ilseq_invalid = false;
handle-cv_shared-ci_hooks = NULL;
return ((iconv_t)(void *)handle);
@@ -223,7 +224,7 @@ __bsd_iconvlist(int (*do_one) (unsigned
return;
}
strlcpy(curkey, list[i], slashpos - list[i] + 1);
- names[j++] = strdup(curkey);
+ names[j++] = curkey;
for (; (i sz) (memcmp(curkey, list[i], strlen(curkey)) ==
0); i++) {
slashpos = strchr(list[i], '/');
curitem = (char *)malloc(strlen(slashpos) + 1);
@@ -235,7 +236,7 @@ __bsd_iconvlist(int (*do_one) (unsigned
if (strcmp(curkey, curitem) == 0) {
continue;
}
- names[j++] = strdup(curitem);
+ names[j++] = curitem;
}
np = (const char * const *)names;
do_one(j, np, data);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267439 - head/usr.bin/iconv
Author: tijl
Date: Fri Jun 13 08:44:03 2014
New Revision: 267439
URL: http://svnweb.freebsd.org/changeset/base/267439
Log:
- Make invalids variable local to do_conv such that it prints the number
of invalid characters of the current file instead of an accumulated
value.
- Make do_conv return an error when invalid characters have been found.
Return EXIT_FAILURE from main if any file contained invalid characters.
This matches the behaviour of GNU iconv.
- Mark usage with __dead2 attribute.
- Make the long_options array const.
Modified:
head/usr.bin/iconv/iconv.c
Modified: head/usr.bin/iconv/iconv.c
==
--- head/usr.bin/iconv/iconv.c Fri Jun 13 08:36:10 2014(r267438)
+++ head/usr.bin/iconv/iconv.c Fri Jun 13 08:44:03 2014(r267439)
@@ -41,13 +41,11 @@
#include string.h
#include unistd.h
-static unsigned long long invalids;
+static int do_conv(FILE *, const char *, const char *, bool, bool);
+static int do_list(unsigned int, const char * const *, void *);
+static voidusage(void) __dead2;
-static void do_conv(FILE *, const char *, const char *, bool,
bool);
-static int do_list(unsigned int, const char * const *, void *);
-static void usage(void);
-
-static struct option long_options[] = {
+static const struct option long_options[] = {
{from-code, required_argument, NULL, 'f'},
{list,no_argument,NULL, 'l'},
{silent, no_argument,NULL, 's'},
@@ -68,12 +66,13 @@ usage(void)
#define INBUFSIZE 1024
#define OUTBUFSIZE (INBUFSIZE * 2)
-static void
+static int
do_conv(FILE *fp, const char *from, const char *to, bool silent,
bool hide_invalid)
{
iconv_t cd;
char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
+ unsigned long long invalids;
const char *in;
size_t inbytes, outbytes, ret;
@@ -84,8 +83,9 @@ do_conv(FILE *fp, const char *from, cons
int arg = 1;
if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)arg) == -1)
- err(1, NULL);
+ err(EXIT_FAILURE, NULL);
}
+ invalids = 0;
while ((inbytes = fread(inbuf, 1, INBUFSIZE, fp)) 0) {
in = inbuf;
while (inbytes 0) {
@@ -135,6 +135,7 @@ do_conv(FILE *fp, const char *from, cons
warnx(warning: invalid characters: %llu, invalids);
iconv_close(cd);
+ return (invalids 0);
}
static int
@@ -157,7 +158,7 @@ main(int argc, char **argv)
{
FILE *fp;
char *opt_f, *opt_t;
- int ch, i;
+ int ch, i, res;
bool opt_c = false, opt_s = false;
opt_f = opt_t = strdup();
@@ -202,18 +203,18 @@ main(int argc, char **argv)
if ((strcmp(opt_f, ) == 0) (strcmp(opt_t, ) == 0))
usage();
if (argc == 0)
- do_conv(stdin, opt_f, opt_t, opt_s, opt_c);
+ res = do_conv(stdin, opt_f, opt_t, opt_s, opt_c);
else {
+ res = 0;
for (i = 0; i argc; i++) {
fp = (strcmp(argv[i], -) != 0) ?
fopen(argv[i], r) : stdin;
if (fp == NULL)
err(EXIT_FAILURE, Cannot open `%s',
argv[i]);
- do_conv(fp, opt_f, opt_t, opt_s,
- opt_c);
+ res |= do_conv(fp, opt_f, opt_t, opt_s, opt_c);
(void)fclose(fp);
}
}
- return (EXIT_SUCCESS);
+ return (res == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267440 - in head: lib share/mk sys/modules sys/sys
Author: hselasky
Date: Fri Jun 13 08:53:49 2014
New Revision: 267440
URL: http://svnweb.freebsd.org/changeset/base/267440
Log:
Attach the CUSE library and kernel module to the default FreeBSD
builds. Bump the FreeBSD version number.
Modified:
head/lib/Makefile
head/share/mk/src.opts.mk
head/sys/modules/Makefile
head/sys/sys/param.h
Modified: head/lib/Makefile
==
--- head/lib/Makefile Fri Jun 13 08:44:03 2014(r267439)
+++ head/lib/Makefile Fri Jun 13 08:53:49 2014(r267440)
@@ -136,6 +136,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libz \
${_atf} \
${_clang} \
+ ${_cuse} \
${_tests}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -172,6 +173,10 @@ _libcasper=libcasper
_clang=clang
.endif
+.if ${MK_CUSE} != no
+_cuse= libcuse
+.endif
+
.if ${MK_GPIB} != no
_libgpib= libgpib
.endif
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Fri Jun 13 08:44:03 2014(r267439)
+++ head/share/mk/src.opts.mk Fri Jun 13 08:53:49 2014(r267440)
@@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \
CROSS_COMPILER \
CRYPT \
CTM \
+CUSE \
CXX \
DICT \
DMAGENT \
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri Jun 13 08:44:03 2014(r267439)
+++ head/sys/modules/Makefile Fri Jun 13 08:53:49 2014(r267440)
@@ -82,6 +82,7 @@ SUBDIR= \
${_ct} \
${_ctau} \
ctl \
+ cuse \
${_cxgb} \
${_cxgbe} \
${_cyclic} \
Modified: head/sys/sys/param.h
==
--- head/sys/sys/param.hFri Jun 13 08:44:03 2014(r267439)
+++ head/sys/sys/param.hFri Jun 13 08:53:49 2014(r267440)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1100022 /* Master, propagated to newvers */
+#define __FreeBSD_version 1100023 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267441 - in head: include tools/build/mk
Author: tijl
Date: Fri Jun 13 10:08:18 2014
New Revision: 267441
URL: http://svnweb.freebsd.org/changeset/base/267441
Log:
Don't install GSS-API headers when the GSSAPI option has been disabled.
Some ports assume GSS-API is supported when they find the headers.
PR: 189156
Submitted by: Garrett Cooper yaneg...@gmail.com
Modified:
head/include/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/include/Makefile
==
--- head/include/Makefile Fri Jun 13 08:53:49 2014(r267440)
+++ head/include/Makefile Fri Jun 13 10:08:18 2014(r267441)
@@ -6,11 +6,11 @@
.include src.opts.mk
CLEANFILES= osreldate.h version vers.c
-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+SUBDIR= arpa protocols rpcsvc rpc xlocale
INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
db.h \
dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+ fts.h ftw.h getopt.h glob.h grp.h \
ieeefp.h ifaddrs.h \
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
@@ -67,6 +67,11 @@ _dev_powermac_nvram= dev/powermac_nvram
_dev_ieee488= dev/ieee488
.endif
+.if ${MK_GSSAPI} != no
+SUBDIR+= gssapi
+INCS+= gssapi.h
+.endif
+
.if ${MK_HESIOD} != no
INCS+= hesiod.h
.endif
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 13 08:53:49
2014(r267440)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 13 10:08:18
2014(r267441)
@@ -1833,6 +1833,9 @@ OLD_DIRS+=usr/share/tmac
.endif
.if ${MK_GSSAPI} == no
+OLD_FILES+=usr/include/gssapi/gssapi.h
+OLD_DIRS+=usr/include/gssapi
+OLD_FILES+=usr/include/gssapi.h
OLD_FILES+=usr/lib/libgssapi.a
OLD_FILES+=usr/lib/libgssapi.so
OLD_LIBS+=usr/lib/libgssapi.so.10
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267442 - stable/10/share/man/man4
Author: brueffer Date: Fri Jun 13 12:01:55 2014 New Revision: 267442 URL: http://svnweb.freebsd.org/changeset/base/267442 Log: MFC: r267185 Minor improvements. Modified: stable/10/share/man/man4/xnb.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/xnb.4 == --- stable/10/share/man/man4/xnb.4 Fri Jun 13 10:08:18 2014 (r267441) +++ stable/10/share/man/man4/xnb.4 Fri Jun 13 12:01:55 2014 (r267442) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd January 6, 2012 +.Dd June 6, 2014 .Dt XNB 4 .Os .Sh NAME @@ -116,7 +116,9 @@ machine. However, when a Xennet interface is bridged to a physical interface, a correct checksum must be attached to any packets bound for that physical interface. -Currently, FreeBSD lacks any mechanism for an ethernet device to +Currently, +.Fx +lacks any mechanism for an Ethernet device to inform the OS that newly received packets are valid even though their checksums are not. So if the netfront driver is configured to offload checksum calculations, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267443 - stable/10/sys/kern
Author: jilles
Date: Fri Jun 13 12:39:06 2014
New Revision: 267443
URL: http://svnweb.freebsd.org/changeset/base/267443
Log:
MFC r267162: ktrace: Use designated initializers for the data_lengths array.
In the .o file, this only changes some line numbers (stable/10 amd64)
because element 0 is no longer explicitly initialized.
This should make bugs like FreeBSD-SA-14:12.ktrace less likely.
Discussed with: des
Modified:
stable/10/sys/kern/kern_ktrace.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_ktrace.c
==
--- stable/10/sys/kern/kern_ktrace.cFri Jun 13 12:01:55 2014
(r267442)
+++ stable/10/sys/kern/kern_ktrace.cFri Jun 13 12:39:06 2014
(r267443)
@@ -109,21 +109,20 @@ struct ktr_request {
};
static int data_lengths[] = {
- 0, /* none */
- offsetof(struct ktr_syscall, ktr_args), /* KTR_SYSCALL */
- sizeof(struct ktr_sysret), /* KTR_SYSRET */
- 0, /* KTR_NAMEI */
- sizeof(struct ktr_genio), /* KTR_GENIO */
- sizeof(struct ktr_psig),/* KTR_PSIG */
- sizeof(struct ktr_csw), /* KTR_CSW */
- 0, /* KTR_USER */
- 0, /* KTR_STRUCT */
- 0, /* KTR_SYSCTL */
- sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */
- 0, /* KTR_PROCDTOR */
- sizeof(struct ktr_cap_fail),/* KTR_CAPFAIL */
- sizeof(struct ktr_fault), /* KTR_FAULT */
- sizeof(struct ktr_faultend),/* KTR_FAULTEND */
+ [KTR_SYSCALL] = offsetof(struct ktr_syscall, ktr_args),
+ [KTR_SYSRET] = sizeof(struct ktr_sysret),
+ [KTR_NAMEI] = 0,
+ [KTR_GENIO] = sizeof(struct ktr_genio),
+ [KTR_PSIG] = sizeof(struct ktr_psig),
+ [KTR_CSW] = sizeof(struct ktr_csw),
+ [KTR_USER] = 0,
+ [KTR_STRUCT] = 0,
+ [KTR_SYSCTL] = 0,
+ [KTR_PROCCTOR] = sizeof(struct ktr_proc_ctor),
+ [KTR_PROCDTOR] = 0,
+ [KTR_CAPFAIL] = sizeof(struct ktr_cap_fail),
+ [KTR_FAULT] = sizeof(struct ktr_fault),
+ [KTR_FAULTEND] = sizeof(struct ktr_faultend),
};
static STAILQ_HEAD(, ktr_request) ktr_free;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267441 - in head: include tools/build/mk
On Fri, Jun 13, 2014 at 6:08 AM, Tijl Coosemans t...@freebsd.org wrote: Author: tijl Date: Fri Jun 13 10:08:18 2014 New Revision: 267441 URL: http://svnweb.freebsd.org/changeset/base/267441 Log: Don't install GSS-API headers when the GSSAPI option has been disabled. Some ports assume GSS-API is supported when they find the headers. I am somewhat surprised that MK_GSSAPI=no does not disable the installation of gssapi_krb5.h as well, which currently is controlled by MK_KERBEROS. Does the infrastructure require that we pick one or the other, or could we make it such that disabling either one disables the gssapi_krb5 functionality? -Ben ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267444 - stable/10/usr.bin/rpcgen
Author: bdrewery
Date: Fri Jun 13 15:04:21 2014
New Revision: 267444
URL: http://svnweb.freebsd.org/changeset/base/267444
Log:
MFC r267174:
Fix some rpcgen sample file issues.
PR: 185582
Modified:
stable/10/usr.bin/rpcgen/rpc_main.c
stable/10/usr.bin/rpcgen/rpc_sample.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/rpcgen/rpc_main.c
==
--- stable/10/usr.bin/rpcgen/rpc_main.c Fri Jun 13 12:39:06 2014
(r267443)
+++ stable/10/usr.bin/rpcgen/rpc_main.c Fri Jun 13 15:04:21 2014
(r267444)
@@ -872,8 +872,8 @@ $(TARGETS_SVC.c) \n\n);
f_print(fout, \t$(CC) -o $(CLIENT) $(OBJECTS_CLNT) \
$(LDLIBS) \n\n);
f_print(fout, $(SERVER) : $(OBJECTS_SVC) \n);
- f_print(fout, \t$(CC) -o $(SERVER) $(OBJECTS_SVC) $(LDLIBS)\n\n );
- f_print(fout, clean:\n\t $(RM) -f core $(TARGETS) $(OBJECTS_CLNT) \
+ f_print(fout, \t$(CC) -o $(SERVER) $(OBJECTS_SVC) $(LDLIBS)\n\n);
+ f_print(fout, clean:\n\t rm -f core $(TARGETS) $(OBJECTS_CLNT) \
$(OBJECTS_SVC) $(CLIENT) $(SERVER)\n\n);
}
Modified: stable/10/usr.bin/rpcgen/rpc_sample.c
==
--- stable/10/usr.bin/rpcgen/rpc_sample.c Fri Jun 13 12:39:06 2014
(r267443)
+++ stable/10/usr.bin/rpcgen/rpc_sample.c Fri Jun 13 15:04:21 2014
(r267444)
@@ -270,6 +270,7 @@ write_sample_clnt_main(void)
version_list *vp;
f_print(fout, \n\n);
+ f_print(fout, int\n);
f_print(fout, main(int argc, char *argv[])\n{\n);
f_print(fout, \tchar *host;);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267233 - in head: . bin/rmail gnu/usr.bin/binutils/addr2line gnu/usr.bin/binutils/nm gnu/usr.bin/binutils/objcopy gnu/usr.bin/binutils/objdump gnu/usr.bin/binutils/readelf gnu/usr.bin
On Jun 8, 2014, at 11:38 AM, Bjoern A. Zeeb b...@freebsd.org wrote: On 08 Jun 2014, at 17:29 , Bryan Drewery bdrew...@freebsd.org wrote: Author: bdrewery Date: Sun Jun 8 17:29:31 2014 New Revision: 267233 URL: http://svnweb.freebsd.org/changeset/base/267233 Log: In preparation for ASLR [1] support add WITH_PIE to support building with -fPIE. This is currently an opt-in build flag. Once ASLR support is ready and stable it should changed to opt-out and be enabled by default along with ASLR. Each application Makefile uses opt-out to ensure that ASLR will be enabled by default in new directories when the system is compiled with PIE/ASLR. [2] Mark known build failures as NO_PIE for now. No, no, no, no more NOs! I’ll leave it to others who understand the current build system in days when it’s not broken to fix this entire splattering across all these Makefiles; we really need a better way for this. I told him it was OK to commit this, and I’d fix it. Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267318 - head/usr.bin/dtc
On Jun 10, 2014, at 7:57 AM, Benjamin Kaduk bjkf...@gmail.com wrote: On Tue, Jun 10, 2014 at 2:16 AM, Rui Paulo rpa...@freebsd.org wrote: Author: rpaulo Date: Tue Jun 10 06:16:34 2014 New Revision: 267318 URL: http://svnweb.freebsd.org/changeset/base/267318 Log: dtc: ignore lines starting with #. This is necessary because we use the C pre-processor to parse #include lines and cpp adds line markings that start with #. [Obligatory note that cpp is tied to its C compiler and is only obligated to produce output acceptable to that C compiler; such output could be arbitrarily complex.] Actually, it isn’t. cpp has an assembler mode, which is what we and linux use for dtc. Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267332 - head/release
On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@freebsd.org wrote:
On 06/10/14 10:05, Julio Merino wrote:
Author: jmmv
Date: Tue Jun 10 17:05:41 2014
New Revision: 267332
URL: http://svnweb.freebsd.org/changeset/base/267332
Log:
Strip out the test suite from the installation media.
This affects the disc1.iso, dvd1.iso and bootonly.iso files.
Obtained from: gjb
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/MakefileTue Jun 10 17:04:30 2014(r267331)
+++ head/release/MakefileTue Jun 10 17:05:41 2014(r267332)
@@ -155,7 +155,7 @@ system: packagesystem
mkdir -p release
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
-WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1
WITHOUT_LIB32=1
+WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
# Copy distfiles
Shouldn't this be WITHOUT_TESTS or the like? I thought we weren't supposed
to set MK_* at the command line.
We recently started allowing MK_TESTS=no on the command line. In general, all
of those WITHOUT_xxx should become MK_xxx=no in release/Makefile. Having the
MK_ version isolates us further from (a) the current defaults and (b)
config files that turn it to the other direction.
Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267332 - head/release
On Fri, Jun 13, 2014 at 10:34:50AM -0600, Warner Losh wrote:
On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@freebsd.org wrote:
On 06/10/14 10:05, Julio Merino wrote:
Author: jmmv
Date: Tue Jun 10 17:05:41 2014
New Revision: 267332
URL: http://svnweb.freebsd.org/changeset/base/267332
Log:
Strip out the test suite from the installation media.
This affects the disc1.iso, dvd1.iso and bootonly.iso files.
Obtained from:gjb
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Tue Jun 10 17:04:30 2014(r267331)
+++ head/release/Makefile Tue Jun 10 17:05:41 2014(r267332)
@@ -155,7 +155,7 @@ system: packagesystem
mkdir -p release
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1
WITHOUT_LIB32=1
+ WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
# Copy distfiles
Shouldn't this be WITHOUT_TESTS or the like? I thought we weren't
supposed to set MK_* at the command line.
We recently started allowing MK_TESTS=no on the command line. In general, all
of those WITHOUT_xxx should become MK_xxx=no in release/Makefile. Having the
MK_ version isolates us further from (a) the current defaults and (b)
config files that turn it to the other direction.
The WITH*_FOO - MK_FOO change is on my TODO this weekend. I want to
run at least one full build before committing it.
Glen
pgpwSXJMFCglD.pgp
Description: PGP signature
Re: svn commit: r267332 - head/release
On Jun 13, 2014, at 10:49 AM, Glen Barber g...@freebsd.org wrote:
On Fri, Jun 13, 2014 at 10:34:50AM -0600, Warner Losh wrote:
On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@freebsd.org
wrote:
On 06/10/14 10:05, Julio Merino wrote:
Author: jmmv
Date: Tue Jun 10 17:05:41 2014
New Revision: 267332
URL: http://svnweb.freebsd.org/changeset/base/267332
Log:
Strip out the test suite from the installation media.
This affects the disc1.iso, dvd1.iso and bootonly.iso files.
Obtained from: gjb
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Tue Jun 10 17:04:30 2014(r267331)
+++ head/release/Makefile Tue Jun 10 17:05:41 2014(r267332)
@@ -155,7 +155,7 @@ system: packagesystem
mkdir -p release
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1
WITHOUT_LIB32=1
+ WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
# Copy distfiles
Shouldn't this be WITHOUT_TESTS or the like? I thought we weren't
supposed to set MK_* at the command line.
We recently started allowing MK_TESTS=no on the command line. In general,
all of those WITHOUT_xxx should become MK_xxx=no in release/Makefile. Having
the MK_ version isolates us further from (a) the current defaults and
(b) config files that turn it to the other direction.
The WITH*_FOO - MK_FOO change is on my TODO this weekend. I want to
run at least one full build before committing it.
There’s no rush. What’s there now works, except in extreme circumstances.
Testing of this stuff is good. It is way too easy to think a change is a NOP
when in fact it breaks something subtle...
Warner
signature.asc
Description: Message signed with OpenPGP using GPGMail
svn commit: r267445 - head
Author: delphij
Date: Fri Jun 13 18:07:42 2014
New Revision: 267445
URL: http://svnweb.freebsd.org/changeset/base/267445
Log:
Add Jung-uk Kim as co-maintainer of OpenSSL per discussion on
-developers and agreed by benl@.
Modified:
head/MAINTAINERS
Modified: head/MAINTAINERS
==
--- head/MAINTAINERSFri Jun 13 15:04:21 2014(r267444)
+++ head/MAINTAINERSFri Jun 13 18:07:42 2014(r267445)
@@ -102,7 +102,7 @@ linux emul emulation Please discuss chan
bs{diff,patch} cpercivaPre-commit review requested.
portsnap cpercivaPre-commit review requested.
freebsd-update cpercivaPre-commit review requested.
-opensslbenlPre-commit review requested.
+opensslbenl,jkim Pre-commit review requested.
sys/netgraph/bluetooth emaxPre-commit review preferred.
lib/libbluetooth emaxPre-commit review preferred.
lib/libsdp emaxPre-commit review preferred.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267446 - in head/sys/dev: amr drm drm2 isp mlx
Author: jhb
Date: Fri Jun 13 18:20:44 2014
New Revision: 267446
URL: http://svnweb.freebsd.org/changeset/base/267446
Log:
Add missing calls to bus_dmamap_unload() when freeing static DMA
allocations.
Reviewed by: scottl
Modified:
head/sys/dev/amr/amr_pci.c
head/sys/dev/drm/ati_pcigart.c
head/sys/dev/drm/drm_pci.c
head/sys/dev/drm2/drm_pci.c
head/sys/dev/isp/isp_pci.c
head/sys/dev/mlx/mlx.c
Modified: head/sys/dev/amr/amr_pci.c
==
--- head/sys/dev/amr/amr_pci.c Fri Jun 13 18:07:42 2014(r267445)
+++ head/sys/dev/amr/amr_pci.c Fri Jun 13 18:20:44 2014(r267446)
@@ -477,20 +477,25 @@ amr_pci_free(struct amr_softc *sc)
bus_dma_tag_destroy(sc-amr_buffer64_dmat);
/* free and destroy DMA memory and tag for passthrough pool */
-if (sc-amr_ccb)
+if (sc-amr_ccb) {
+ bus_dmamap_unload(sc-amr_ccb_dmat, sc-amr_ccb_dmamap);
bus_dmamem_free(sc-amr_ccb_dmat, sc-amr_ccb, sc-amr_ccb_dmamap);
+}
if (sc-amr_ccb_dmat)
bus_dma_tag_destroy(sc-amr_ccb_dmat);
/* free and destroy DMA memory and tag for s/g lists */
-if (sc-amr_sgtable)
+if (sc-amr_sgtable) {
+ bus_dmamap_unload(sc-amr_sg_dmat, sc-amr_sg_dmamap);
bus_dmamem_free(sc-amr_sg_dmat, sc-amr_sgtable, sc-amr_sg_dmamap);
+}
if (sc-amr_sg_dmat)
bus_dma_tag_destroy(sc-amr_sg_dmat);
/* free and destroy DMA memory and tag for mailbox */
p = (void *)(uintptr_t)(volatile void *)sc-amr_mailbox64;
if (sc-amr_mailbox) {
+ bus_dmamap_unload(sc-amr_mailbox_dmat, sc-amr_mailbox_dmamap);
bus_dmamem_free(sc-amr_mailbox_dmat, p, sc-amr_mailbox_dmamap);
}
if (sc-amr_mailbox_dmat)
Modified: head/sys/dev/drm/ati_pcigart.c
==
--- head/sys/dev/drm/ati_pcigart.c Fri Jun 13 18:07:42 2014
(r267445)
+++ head/sys/dev/drm/ati_pcigart.c Fri Jun 13 18:20:44 2014
(r267446)
@@ -116,6 +116,7 @@ drm_ati_free_pcigart_table(struct drm_de
{
struct drm_dma_handle *dmah = gart_info-dmah;
+ bus_dmamap_unload(dmah-tag, dmah-map);
bus_dmamem_free(dmah-tag, dmah-vaddr, dmah-map);
bus_dma_tag_destroy(dmah-tag);
free(dmah, DRM_MEM_DMA);
Modified: head/sys/dev/drm/drm_pci.c
==
--- head/sys/dev/drm/drm_pci.c Fri Jun 13 18:07:42 2014(r267445)
+++ head/sys/dev/drm/drm_pci.c Fri Jun 13 18:20:44 2014(r267446)
@@ -119,6 +119,7 @@ drm_pci_free(struct drm_device *dev, drm
if (dmah == NULL)
return;
+ bus_dmamap_unload(dmah-tag, dmah-map);
bus_dmamem_free(dmah-tag, dmah-vaddr, dmah-map);
bus_dma_tag_destroy(dmah-tag);
Modified: head/sys/dev/drm2/drm_pci.c
==
--- head/sys/dev/drm2/drm_pci.c Fri Jun 13 18:07:42 2014(r267445)
+++ head/sys/dev/drm2/drm_pci.c Fri Jun 13 18:20:44 2014(r267446)
@@ -116,6 +116,7 @@ drm_pci_free(struct drm_device *dev, drm
if (dmah == NULL)
return;
+ bus_dmamap_unload(dmah-tag, dmah-map);
bus_dmamem_free(dmah-tag, dmah-vaddr, dmah-map);
bus_dma_tag_destroy(dmah-tag);
Modified: head/sys/dev/isp/isp_pci.c
==
--- head/sys/dev/isp/isp_pci.c Fri Jun 13 18:07:42 2014(r267445)
+++ head/sys/dev/isp/isp_pci.c Fri Jun 13 18:20:44 2014(r267446)
@@ -1741,6 +1741,7 @@ isp_pci_mbxdma(ispsoftc_t *isp)
bad:
while (--cmap = 0) {
struct isp_fc *fc = ISP_FC_PC(isp, cmap);
+ bus_dmamap_unload(fc-tdmat, fc-tdmap);
bus_dmamem_free(fc-tdmat, base, fc-tdmap);
bus_dma_tag_destroy(fc-tdmat);
while (fc-nexus_free_list) {
@@ -1749,6 +1750,8 @@ bad:
free(n, M_DEVBUF);
}
}
+ if (isp-isp_rquest_dma != 0)
+ bus_dmamap_unload(isp-isp_osinfo.cdmat, isp-isp_osinfo.cdmap);
bus_dmamem_free(isp-isp_osinfo.cdmat, base, isp-isp_osinfo.cdmap);
bus_dma_tag_destroy(isp-isp_osinfo.cdmat);
free(isp-isp_xflist, M_DEVBUF);
Modified: head/sys/dev/mlx/mlx.c
==
--- head/sys/dev/mlx/mlx.c Fri Jun 13 18:07:42 2014(r267445)
+++ head/sys/dev/mlx/mlx.c Fri Jun 13 18:20:44 2014(r267446)
@@ -191,6 +191,8 @@ mlx_free(struct mlx_softc *sc)
bus_dma_tag_destroy(sc-mlx_buffer_dmat);
/* free and destroy DMA memory and tag for s/g lists */
+if (sc-mlx_sgbusaddr)
+ bus_dmamap_unload(sc-mlx_sg_dmat, sc-mlx_sg_dmamap);
if (sc-mlx_sgtable)
bus_dmamem_free(sc-mlx_sg_dmat, sc-mlx_sgtable,
svn commit: r267447 - in stable/10: sys/amd64/include sys/amd64/vmm sys/amd64/vmm/intel sys/amd64/vmm/io usr.sbin/bhyve
Author: jhb
Date: Fri Jun 13 19:10:40 2014
New Revision: 267447
URL: http://svnweb.freebsd.org/changeset/base/267447
Log:
MFC 262139,262140,262236,262281,262532:
Various x2APIC fixes and enhancements:
- Use spinlocks for the vioapic.
- Handle the SELF_IPI MSR.
- Simplify the APIC mode switching between MMIO and x2APIC. The guest is
no longer allowed to switch modes at runtime. Instead, the desired mode
is set when the virtual machine is created.
- Disallow MMIO access in x2APIC mode and MSR access in xAPIC mode.
- Add support for x2APIC virtualization assist in Intel VT-x.
Modified:
stable/10/sys/amd64/include/vmm.h
stable/10/sys/amd64/vmm/intel/vmx.c
stable/10/sys/amd64/vmm/io/vioapic.c
stable/10/sys/amd64/vmm/io/vlapic.c
stable/10/sys/amd64/vmm/io/vlapic.h
stable/10/sys/amd64/vmm/io/vlapic_priv.h
stable/10/sys/amd64/vmm/vmm.c
stable/10/sys/amd64/vmm/vmm_lapic.c
stable/10/sys/amd64/vmm/x86.c
stable/10/usr.sbin/bhyve/bhyve.8
stable/10/usr.sbin/bhyve/bhyverun.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/include/vmm.h
==
--- stable/10/sys/amd64/include/vmm.h Fri Jun 13 18:20:44 2014
(r267446)
+++ stable/10/sys/amd64/include/vmm.h Fri Jun 13 19:10:40 2014
(r267447)
@@ -273,9 +273,8 @@ enum vm_cap_type {
};
enum x2apic_state {
- X2APIC_ENABLED,
- X2APIC_AVAILABLE,
X2APIC_DISABLED,
+ X2APIC_ENABLED,
X2APIC_STATE_LAST
};
Modified: stable/10/sys/amd64/vmm/intel/vmx.c
==
--- stable/10/sys/amd64/vmm/intel/vmx.c Fri Jun 13 18:20:44 2014
(r267446)
+++ stable/10/sys/amd64/vmm/intel/vmx.c Fri Jun 13 19:10:40 2014
(r267447)
@@ -114,6 +114,9 @@ __FBSDID($FreeBSD$);
#defineguest_msr_rw(vmx, msr) \
msr_bitmap_change_access((vmx)-msr_bitmap, (msr), MSR_BITMAP_ACCESS_RW)
+#defineguest_msr_ro(vmx, msr) \
+msr_bitmap_change_access((vmx)-msr_bitmap, (msr), MSR_BITMAP_ACCESS_READ)
+
#defineHANDLED 1
#defineUNHANDLED 0
@@ -302,6 +305,54 @@ exit_reason_to_str(int reason)
}
#endif /* KTR */
+static int
+vmx_allow_x2apic_msrs(struct vmx *vmx)
+{
+ int i, error;
+
+ error = 0;
+
+ /*
+* Allow readonly access to the following x2APIC MSRs from the guest.
+*/
+ error += guest_msr_ro(vmx, MSR_APIC_ID);
+ error += guest_msr_ro(vmx, MSR_APIC_VERSION);
+ error += guest_msr_ro(vmx, MSR_APIC_LDR);
+ error += guest_msr_ro(vmx, MSR_APIC_SVR);
+
+ for (i = 0; i 8; i++)
+ error += guest_msr_ro(vmx, MSR_APIC_ISR0 + i);
+
+ for (i = 0; i 8; i++)
+ error += guest_msr_ro(vmx, MSR_APIC_TMR0 + i);
+
+ for (i = 0; i 8; i++)
+ error += guest_msr_ro(vmx, MSR_APIC_IRR0 + i);
+
+ error += guest_msr_ro(vmx, MSR_APIC_ESR);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_TIMER);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_THERMAL);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_PCINT);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_LINT0);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_LINT1);
+ error += guest_msr_ro(vmx, MSR_APIC_LVT_ERROR);
+ error += guest_msr_ro(vmx, MSR_APIC_ICR_TIMER);
+ error += guest_msr_ro(vmx, MSR_APIC_DCR_TIMER);
+ error += guest_msr_ro(vmx, MSR_APIC_ICR);
+
+ /*
+* Allow TPR, EOI and SELF_IPI MSRs to be read and written by the guest.
+*
+* These registers get special treatment described in the section
+* Virtualizing MSR-Based APIC Accesses.
+*/
+ error += guest_msr_rw(vmx, MSR_APIC_TPR);
+ error += guest_msr_rw(vmx, MSR_APIC_EOI);
+ error += guest_msr_rw(vmx, MSR_APIC_SELF_IPI);
+
+ return (error);
+}
+
u_long
vmx_fix_cr0(u_long cr0)
{
@@ -1499,17 +1550,53 @@ ept_emulation_fault(uint64_t ept_qual)
return (TRUE);
}
+static __inline int
+apic_access_virtualization(struct vmx *vmx, int vcpuid)
+{
+ uint32_t proc_ctls2;
+
+ proc_ctls2 = vmx-cap[vcpuid].proc_ctls2;
+ return ((proc_ctls2 PROCBASED2_VIRTUALIZE_APIC_ACCESSES) ? 1 : 0);
+}
+
+static __inline int
+x2apic_virtualization(struct vmx *vmx, int vcpuid)
+{
+ uint32_t proc_ctls2;
+
+ proc_ctls2 = vmx-cap[vcpuid].proc_ctls2;
+ return ((proc_ctls2 PROCBASED2_VIRTUALIZE_X2APIC_MODE) ? 1 : 0);
+}
+
static int
-vmx_handle_apic_write(struct vlapic *vlapic, uint64_t qual)
+vmx_handle_apic_write(struct vmx *vmx, int vcpuid, struct vlapic *vlapic,
+uint64_t qual)
{
int error, handled, offset;
+ uint32_t *apic_regs, vector;
bool retu;
- if (!virtual_interrupt_delivery)
- return (UNHANDLED);
-
handled = HANDLED;
offset = APIC_WRITE_OFFSET(qual);
+
+ if
svn commit: r267448 - head/sys/dev/ubsec
Author: jhb
Date: Fri Jun 13 19:34:34 2014
New Revision: 267448
URL: http://svnweb.freebsd.org/changeset/base/267448
Log:
Don't check maps for static DMA allocations against NULL to see if an
allocation succeeded. Instead, check the tag against NULL.
Modified:
head/sys/dev/ubsec/ubsec.c
Modified: head/sys/dev/ubsec/ubsec.c
==
--- head/sys/dev/ubsec/ubsec.c Fri Jun 13 19:10:40 2014(r267447)
+++ head/sys/dev/ubsec/ubsec.c Fri Jun 13 19:34:34 2014(r267448)
@@ -2301,25 +2301,25 @@ ubsec_kprocess_modexp_sw(struct ubsec_so
errout:
if (me != NULL) {
- if (me-me_q.q_mcr.dma_map != NULL)
+ if (me-me_q.q_mcr.dma_tag != NULL)
ubsec_dma_free(sc, me-me_q.q_mcr);
- if (me-me_q.q_ctx.dma_map != NULL) {
+ if (me-me_q.q_ctx.dma_tag != NULL) {
bzero(me-me_q.q_ctx.dma_vaddr,
me-me_q.q_ctx.dma_size);
ubsec_dma_free(sc, me-me_q.q_ctx);
}
- if (me-me_M.dma_map != NULL) {
+ if (me-me_M.dma_tag != NULL) {
bzero(me-me_M.dma_vaddr, me-me_M.dma_size);
ubsec_dma_free(sc, me-me_M);
}
- if (me-me_E.dma_map != NULL) {
+ if (me-me_E.dma_tag != NULL) {
bzero(me-me_E.dma_vaddr, me-me_E.dma_size);
ubsec_dma_free(sc, me-me_E);
}
- if (me-me_C.dma_map != NULL) {
+ if (me-me_C.dma_tag != NULL) {
bzero(me-me_C.dma_vaddr, me-me_C.dma_size);
ubsec_dma_free(sc, me-me_C);
}
- if (me-me_epb.dma_map != NULL)
+ if (me-me_epb.dma_tag != NULL)
ubsec_dma_free(sc, me-me_epb);
free(me, M_DEVBUF);
}
@@ -2502,25 +2502,25 @@ ubsec_kprocess_modexp_hw(struct ubsec_so
errout:
if (me != NULL) {
- if (me-me_q.q_mcr.dma_map != NULL)
+ if (me-me_q.q_mcr.dma_tag != NULL)
ubsec_dma_free(sc, me-me_q.q_mcr);
- if (me-me_q.q_ctx.dma_map != NULL) {
+ if (me-me_q.q_ctx.dma_tag != NULL) {
bzero(me-me_q.q_ctx.dma_vaddr,
me-me_q.q_ctx.dma_size);
ubsec_dma_free(sc, me-me_q.q_ctx);
}
- if (me-me_M.dma_map != NULL) {
+ if (me-me_M.dma_tag != NULL) {
bzero(me-me_M.dma_vaddr, me-me_M.dma_size);
ubsec_dma_free(sc, me-me_M);
}
- if (me-me_E.dma_map != NULL) {
+ if (me-me_E.dma_tag != NULL) {
bzero(me-me_E.dma_vaddr, me-me_E.dma_size);
ubsec_dma_free(sc, me-me_E);
}
- if (me-me_C.dma_map != NULL) {
+ if (me-me_C.dma_tag != NULL) {
bzero(me-me_C.dma_vaddr, me-me_C.dma_size);
ubsec_dma_free(sc, me-me_C);
}
- if (me-me_epb.dma_map != NULL)
+ if (me-me_epb.dma_tag != NULL)
ubsec_dma_free(sc, me-me_epb);
free(me, M_DEVBUF);
}
@@ -2696,13 +2696,13 @@ ubsec_kprocess_rsapriv(struct ubsec_soft
errout:
if (rp != NULL) {
- if (rp-rpr_q.q_mcr.dma_map != NULL)
+ if (rp-rpr_q.q_mcr.dma_tag != NULL)
ubsec_dma_free(sc, rp-rpr_q.q_mcr);
- if (rp-rpr_msgin.dma_map != NULL) {
+ if (rp-rpr_msgin.dma_tag != NULL) {
bzero(rp-rpr_msgin.dma_vaddr, rp-rpr_msgin.dma_size);
ubsec_dma_free(sc, rp-rpr_msgin);
}
- if (rp-rpr_msgout.dma_map != NULL) {
+ if (rp-rpr_msgout.dma_tag != NULL) {
bzero(rp-rpr_msgout.dma_vaddr,
rp-rpr_msgout.dma_size);
ubsec_dma_free(sc, rp-rpr_msgout);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267449 - head/sys/dev/iwn
Author: jhb
Date: Fri Jun 13 19:40:02 2014
New Revision: 267449
URL: http://svnweb.freebsd.org/changeset/base/267449
Log:
- Don't check the dma map address for a static DMA mapping against NULL
to determine if the mapping is valid.
- Don't explicitly destroy the dmap map for static DMA mappings.
Reviewed by: adrian
Modified:
head/sys/dev/iwn/if_iwn.c
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Fri Jun 13 19:34:34 2014(r267448)
+++ head/sys/dev/iwn/if_iwn.c Fri Jun 13 19:40:02 2014(r267449)
@@ -1733,16 +1733,12 @@ fail: iwn_dma_contig_free(dma);
static void
iwn_dma_contig_free(struct iwn_dma_info *dma)
{
- if (dma-map != NULL) {
- if (dma-vaddr != NULL) {
- bus_dmamap_sync(dma-tag, dma-map,
- BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(dma-tag, dma-map);
- bus_dmamem_free(dma-tag, dma-vaddr, dma-map);
- dma-vaddr = NULL;
- }
- bus_dmamap_destroy(dma-tag, dma-map);
- dma-map = NULL;
+ if (dma-vaddr != NULL) {
+ bus_dmamap_sync(dma-tag, dma-map,
+ BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_unload(dma-tag, dma-map);
+ bus_dmamem_free(dma-tag, dma-vaddr, dma-map);
+ dma-vaddr = NULL;
}
if (dma-tag != NULL) {
bus_dma_tag_destroy(dma-tag);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267450 - stable/10/usr.sbin/bhyve
Author: jhb
Date: Fri Jun 13 21:30:40 2014
New Revision: 267450
URL: http://svnweb.freebsd.org/changeset/base/267450
Log:
MFC 262744:
Add SMBIOS support.
A new option, -U, can be used to set the UUID in the System
Information (Type 1) structure.
Added:
stable/10/usr.sbin/bhyve/smbiostbl.c
- copied unchanged from r262744, head/usr.sbin/bhyve/smbiostbl.c
stable/10/usr.sbin/bhyve/smbiostbl.h
- copied unchanged from r262744, head/usr.sbin/bhyve/smbiostbl.h
Modified:
stable/10/usr.sbin/bhyve/Makefile
stable/10/usr.sbin/bhyve/acpi.c
stable/10/usr.sbin/bhyve/bhyverun.c
stable/10/usr.sbin/bhyve/bhyverun.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bhyve/Makefile
==
--- stable/10/usr.sbin/bhyve/Makefile Fri Jun 13 19:40:02 2014
(r267449)
+++ stable/10/usr.sbin/bhyve/Makefile Fri Jun 13 21:30:40 2014
(r267450)
@@ -34,6 +34,7 @@ SRCS= \
pmtmr.c \
post.c \
rtc.c \
+ smbiostbl.c \
uart_emul.c \
virtio.c\
xmsr.c \
Modified: stable/10/usr.sbin/bhyve/acpi.c
==
--- stable/10/usr.sbin/bhyve/acpi.c Fri Jun 13 19:40:02 2014
(r267449)
+++ stable/10/usr.sbin/bhyve/acpi.c Fri Jun 13 21:30:40 2014
(r267450)
@@ -39,14 +39,14 @@
*
* Layout
* --
- * RSDP - 0xf0400(36 bytes fixed)
- * RSDT - 0xf0440(36 bytes + 4*N table addrs, 2 used)
- * XSDT - 0xf0480(36 bytes + 8*N table addrs, 2 used)
- * MADT - 0xf0500 (depends on #CPUs)
- * FADT - 0xf0600 (268 bytes)
- * HPET - 0xf0740 (56 bytes)
- * FACS - 0xf0780 (64 bytes)
- * DSDT - 0xf0800 (variable - can go up to 0x10)
+ * RSDP - 0xf2400(36 bytes fixed)
+ * RSDT - 0xf2440(36 bytes + 4*N table addrs, 2 used)
+ * XSDT - 0xf2480(36 bytes + 8*N table addrs, 2 used)
+ * MADT - 0xf2500 (depends on #CPUs)
+ * FADT - 0xf2600 (268 bytes)
+ * HPET - 0xf2740 (56 bytes)
+ * FACS - 0xf2780 (64 bytes)
+ * DSDT - 0xf2800 (variable - can go up to 0x10)
*/
#include sys/cdefs.h
@@ -74,7 +74,7 @@ __FBSDID($FreeBSD$);
* Define the base address of the ACPI tables, and the offsets to
* the individual tables
*/
-#define BHYVE_ACPI_BASE0xf0400
+#define BHYVE_ACPI_BASE0xf2400
#define RSDT_OFFSET0x040
#define XSDT_OFFSET0x080
#define MADT_OFFSET0x100
Modified: stable/10/usr.sbin/bhyve/bhyverun.c
==
--- stable/10/usr.sbin/bhyve/bhyverun.c Fri Jun 13 19:40:02 2014
(r267449)
+++ stable/10/usr.sbin/bhyve/bhyverun.c Fri Jun 13 21:30:40 2014
(r267450)
@@ -61,6 +61,7 @@ __FBSDID($FreeBSD$);
#include mptbl.h
#include pci_emul.h
#include pci_lpc.h
+#include smbiostbl.h
#include xmsr.h
#include spinup_ap.h
#include rtc.h
@@ -82,6 +83,7 @@ typedef int (*vmexit_handler_t)(struct v
char *vmname;
int guest_ncpus;
+char *guest_uuid_str;
static int pincpu = -1;
static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
@@ -141,7 +143,8 @@ usage(int code)
-l: LPC device configuration\n
-m: memory size in MB\n
-w: ignore unimplemented MSRs\n
- -x: local apic is in x2APIC mode\n,
+ -x: local apic is in x2APIC mode\n
+ -U: uuid\n,
progname, (int)strlen(progname), );
exit(code);
@@ -599,7 +602,7 @@ main(int argc, char *argv[])
guest_ncpus = 1;
memsize = 256 * MB;
- while ((c = getopt(argc, argv, abehwxAHIPWp:g:c:s:m:l:)) != -1) {
+ while ((c = getopt(argc, argv, abehwxAHIPWp:g:c:s:m:l:U:)) != -1) {
switch (c) {
case 'a':
x2apic_mode = 0;
@@ -653,6 +656,9 @@ main(int argc, char *argv[])
case 'e':
strictio = 1;
break;
+ case 'U':
+ guest_uuid_str = optarg;
+ break;
case 'w':
strictmsr = 0;
break;
@@ -723,6 +729,9 @@ main(int argc, char *argv[])
*/
mptable_build(ctx, guest_ncpus);
+ error = smbios_build(ctx);
+ assert(error == 0);
+
if (acpi) {
error = acpi_build(ctx, guest_ncpus);
assert(error == 0);
Modified: stable/10/usr.sbin/bhyve/bhyverun.h
==
---
Re: svn commit: r267107 - stable/10/sys/i386/conf
On Jun 7, 2014, at 3:48 PM, Marius Strobl mar...@alchemy.franken.de wrote:
On Sat, Jun 07, 2014 at 09:23:47AM -0600, Warner Losh wrote:
Why? There should be no -gdwarf-2 in the tree, that was a workaround that
has since been obsoleted by (a) -g automatically changes to this in the
makefile system and (b) the default was reverted back to dwarf 2. This
wasn?t a mismerge, but an intentional fix.
Because despite what you say, -gdwarf-2 actually still is in stable/9 and
stable/10 as of now:
marius@alchemy:/home/marius/co grep -l -- -gdwarf-2 {9,10}/src/sys/*/conf/*
9/src/sys/amd64/conf/GENERIC
9/src/sys/i386/conf/GENERIC
9/src/sys/i386/conf/XEN
9/src/sys/sparc64/conf/GENERIC
10/src/sys/amd64/conf/GENERIC
10/src/sys/i386/conf/GENERIC
10/src/sys/i386/conf/XEN
10/src/sys/sparc64/conf/GENERIC
And also because replacing -gdwarf-2 with -g just wasn't part of r266820,
doing the former when MFCing that revision as r267049 simply was a mismerge
on my part.
Apart from these I'm fully aware that -gdwarf-2 was/is only transient, but
we're just not fully back to -g, yet.
Oh, yea, the MFC issue…. Yea, you’re right. That mess hasn’t been sorted out
yet :( I’ll sort 10 out this weekend and 9 out after 9.3, per the RE’s request.
Warner
signature.asc
Description: Message signed with OpenPGP using GPGMail
svn commit: r267451 - head/sys/dev/mfi
Author: delphij Date: Fri Jun 13 22:33:41 2014 New Revision: 267451 URL: http://svnweb.freebsd.org/changeset/base/267451 Log: Correct variable for loader tunable variable hw.mfi.mrsas_enable. Submitted by: Sascha Wildner (DragonFly) MFC after:3 days Modified: head/sys/dev/mfi/mfi_pci.c Modified: head/sys/dev/mfi/mfi_pci.c == --- head/sys/dev/mfi/mfi_pci.c Fri Jun 13 21:30:40 2014(r267450) +++ head/sys/dev/mfi/mfi_pci.c Fri Jun 13 22:33:41 2014(r267451) @@ -113,7 +113,7 @@ SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFL Enable use of MSI interrupts); static int mfi_mrsas_enable = 0; -TUNABLE_INT(hw.mfi.mrsas_enable, mfi_msi); +TUNABLE_INT(hw.mfi.mrsas_enable, mfi_mrsas_enable); SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, mfi_mrsas_enable, 0, Allow mrasas to take newer cards); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267452 - head/contrib/tzdata
Author: edwin Date: Fri Jun 13 23:56:47 2014 New Revision: 267452 URL: http://svnweb.freebsd.org/changeset/base/267452 Log: Vendor import of tzdata2014e changes Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Obtained from:ftp://ftp.iana.org/tz/releases/ Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Fri Jun 13 22:33:41 2014(r267451) +++ head/contrib/tzdata/africa Fri Jun 13 23:56:47 2014(r267452) @@ -239,13 +239,13 @@ Rule Egypt 19901994- May 1 1:001:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # /a Rule Egypt 19952010- Apr lastFri 0:00s 1:00S -Rule Egypt 19952005- Sep lastThu 23:00s 0 - +Rule Egypt 19952005- Sep lastThu 24:00 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006only- Sep 21 23:00s 0 - +Rule Egypt 2006only- Sep 21 24:00 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ RuleEgypt 2006only- Sep 21 23:00s 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm -Rule Egypt 2007only- Sep Thu=1 23:00s 0 - +Rule Egypt 2007only- Sep Thu=1 24:00 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,46 +342,77 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May midnight (24:00) -# From Paul Eggert (2014-05-13): +# From Imed Chihi (2014-06-04): +# We have finally located a precise official reference about the DST changes +# in Egypt. The Ministers Cabinet decision is explained at +# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... +# [T]his (Arabic) site is not accessible outside Egypt, but the page ... +# translates into: With regard to daylight saving time, it is scheduled to +# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, +# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, +# and re-established again at the end of the month of Ramadan, at twelve +# o'clock on the evening of Thursday, 31 JUL 2014. This statement has been +# reproduced by other (more accessible) sites[, e.g.,]... +# http://elgornal.net/news/news.aspx?id=4699258 + +# From Paul Eggert (2014-06-04): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. The AP story says -# DST will not be observed during Ramadan. There is no information about when -# DST will end. See: +# above) says DST had no affect on electricity consumption. There is +# no information about when DST will end this fall. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later transitions will use 2010's rules, and that -# Egypt will agree with Morocco (see below) about the date Ramadan starts and -# ends, though (unlike Morocco) it will switch at 00:00 standard time. In -# Egypt the spring-forward transitions are removed for 2020-2022, when the -# guessed spring-forward date falls during the estimated Ramadan, and all -# transitions removed for 2023-2038, where the estimated Ramadan falls entirely -# outside the guessed daylight-saving time. Ramadan intrudes on the guessed -# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. - -Rule Egypt 2008only- Aug lastThu 23:00s 0 - -Rule Egypt 2009only- Aug 20 23:00s 0 - -Rule Egypt 2010only
svn commit: r267453 - vendor/tzdata/tzdata2013e
Author: edwin Date: Sat Jun 14 00:00:03 2014 New Revision: 267453 URL: http://svnweb.freebsd.org/changeset/base/267453 Log: Tag of tzdata2014e sources. Added: vendor/tzdata/tzdata2013e/ - copied from r267452, vendor/tzdata/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267454 - head/usr.bin/calendar/calendars
Author: shurd (ports committer) Date: Sat Jun 14 00:10:10 2014 New Revision: 267454 URL: http://svnweb.freebsd.org/changeset/base/267454 Log: Added: - my birthday Approved by: db, skreuzer (mentors) Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdSat Jun 14 00:00:03 2014(r267453) +++ head/usr.bin/calendar/calendars/calendar.freebsdSat Jun 14 00:10:10 2014(r267454) @@ -365,6 +365,7 @@ 12/18 Chris Timmons c...@freebsd.org born in Ellensburg, Washington, United States, 1964 12/18 Dag-Erling Smorgrav d...@freebsd.org born in Brussels, Belgium, 1977 12/18 Semen Ustimenko sem...@freebsd.org born in Novosibirsk, Russian Federation, 1979 +12/19 Stephen Hurd sh...@freebsd.org born in Estevan, Saskatchewan, Canada, 1975 12/21 Rong-En Fan ra...@freebsd.org born in Taipei, Taiwan, Republic of China, 1982 12/22 Maxim Sobolev sobo...@freebsd.org born in Dnepropetrovsk, Ukraine, 1976 12/23 Sean Chittenden se...@freebsd.org born in Seattle, Washington, United States, 1979 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267455 - head/contrib/tzdata
Author: edwin Date: Sat Jun 14 00:16:50 2014 New Revision: 267455 URL: http://svnweb.freebsd.org/changeset/base/267455 Log: MFV of tzdata2014e Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Modified: Directory Properties: head/contrib/tzdata/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267456 - stable/6/share/zoneinfo
Author: edwin Date: Sat Jun 14 00:18:17 2014 New Revision: 267456 URL: http://svnweb.freebsd.org/changeset/base/267456 Log: MFC of tzdata2014e Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Modified: Directory Properties: stable/6/share/zoneinfo/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267457 - in stable/10/sys/dev: hpt27xx hptmv hptrr
Author: delphij
Date: Sat Jun 14 00:44:57 2014
New Revision: 267457
URL: http://svnweb.freebsd.org/changeset/base/267457
Log:
MFC r267368:
Apply vendor fixes to the High Point drivers:
- Don't call xpt_free_path() in os_query_remove_device() and
always return TRUE.
- Update os_buildsgl() to support build logical SG table which
will be used by lower RAID module.
- Return CAM_SEL_TIMEOUTstatus for SCSIcommand failed as target
missing.
Many thanks to HighPoint for providing this driver update.
Submitted by: Steve Chang
Reviewed by: mav
Modified:
stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c
stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
stable/10/sys/dev/hptmv/entry.c
stable/10/sys/dev/hptrr/hptrr_os_bsd.c
stable/10/sys/dev/hptrr/hptrr_osm_bsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c
==
--- stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c Sat Jun 14 00:18:17 2014
(r267456)
+++ stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
@@ -324,21 +324,7 @@ int os_revalidate_device(void *osext, in
int os_query_remove_device(void *osext, int id)
{
- PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
- struct cam_periph *periph = NULL;
-struct cam_path*path;
-intstatus,retval = 0;
-
-status = xpt_create_path(path, NULL, vbus_ext-sim-path_id, id, 0);
-if (status == CAM_REQ_CMP) {
- if((periph = cam_periph_find(path, da)) != NULL){
- if(periph-refcount = 1)
- retval = -1;
- }
- xpt_free_path(path);
-}
-
-return retval;
+ return 0;
}
HPT_U8 os_get_vbus_seq(void *osext)
Modified: stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
==
--- stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Jun 14 00:18:17 2014
(r267456)
+++ stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
@@ -474,6 +474,16 @@ static void os_cmddone(PCOMMAND pCmd)
static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
{
+ POS_CMDEXT ext = (POS_CMDEXT)pCmd-priv;
+ union ccb *ccb = ext-ccb;
+
+ if (logical) {
+ os_set_sgptr(pSg, (HPT_U8 *)ccb-csio.data_ptr);
+ pSg-size = ccb-csio.dxfer_len;
+ pSg-eot = 1;
+ return TRUE;
+ }
+
/* since we have provided physical sg, nobody will ask us to build
physical sg */
HPT_ASSERT(0);
return FALSE;
@@ -546,7 +556,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_e
vd = ldm_find_target(vbus, ccb-ccb_h.target_id);
if (!vd) {
- ccb-ccb_h.status = CAM_TID_INVALID;
+ ccb-ccb_h.status = CAM_SEL_TIMEOUT;
xpt_done(ccb);
return;
}
Modified: stable/10/sys/dev/hptmv/entry.c
==
--- stable/10/sys/dev/hptmv/entry.c Sat Jun 14 00:18:17 2014
(r267456)
+++ stable/10/sys/dev/hptmv/entry.c Sat Jun 14 00:44:57 2014
(r267457)
@@ -2016,7 +2016,7 @@ hpt_probe(device_t dev)
{
KdPrintI((CONTROLLER_NAME found\n));
device_set_desc(dev, CONTROLLER_NAME);
- return 0;
+ return (BUS_PROBE_DEFAULT);
}
else
return(ENXIO);
@@ -2623,7 +2623,14 @@ launch_worker_thread(void)
int HPTLIBAPI fOsBuildSgl(_VBUS_ARG PCommand pCmd, FPSCAT_GATH pSg, int
logical)
{
-
+ union ccb *ccb = (union ccb *)pCmd-pOrgCommand;
+
+ if (logical) {
+ pSg-dSgAddress = (ULONG_PTR)(UCHAR *)ccb-csio.data_ptr;
+ pSg-wSgSize = ccb-csio.dxfer_len;
+ pSg-wSgFlag = SG_FLAG_EOT;
+ return TRUE;
+ }
/* since we have provided physical sg, nobody will ask us to build
physical sg */
HPT_ASSERT(0);
return FALSE;
Modified: stable/10/sys/dev/hptrr/hptrr_os_bsd.c
==
--- stable/10/sys/dev/hptrr/hptrr_os_bsd.c Sat Jun 14 00:18:17 2014
(r267456)
+++ stable/10/sys/dev/hptrr/hptrr_os_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
@@ -256,21 +256,7 @@ int os_revalidate_device(void *osext, in
int os_query_remove_device(void *osext, int id)
{
- PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
- struct cam_periph *periph = NULL;
-struct cam_path*path;
-intstatus,retval = 0;
-
-status = xpt_create_path(path,
svn commit: r267458 - in stable/9/sys/dev: hpt27xx hptmv hptrr
Author: delphij
Date: Sat Jun 14 00:54:57 2014
New Revision: 267458
URL: http://svnweb.freebsd.org/changeset/base/267458
Log:
MFC r267368:
Apply vendor fixes to the High Point drivers:
- Don't call xpt_free_path() in os_query_remove_device() and
always return TRUE.
- Update os_buildsgl() to support build logical SG table which
will be used by lower RAID module.
- Return CAM_SEL_TIMEOUTstatus for SCSIcommand failed as target
missing.
Many thanks to HighPoint for providing this driver update.
Submitted by: Steve Chang
Reviewed by: mav
Approved by: re (gjb)
Modified:
stable/9/sys/dev/hpt27xx/hpt27xx_os_bsd.c
stable/9/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
stable/9/sys/dev/hptmv/entry.c
stable/9/sys/dev/hptrr/hptrr_os_bsd.c
stable/9/sys/dev/hptrr/hptrr_osm_bsd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/hpt27xx/hpt27xx_os_bsd.c
==
--- stable/9/sys/dev/hpt27xx/hpt27xx_os_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
+++ stable/9/sys/dev/hpt27xx/hpt27xx_os_bsd.c Sat Jun 14 00:54:57 2014
(r267458)
@@ -324,21 +324,7 @@ int os_revalidate_device(void *osext, in
int os_query_remove_device(void *osext, int id)
{
- PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
- struct cam_periph *periph = NULL;
-struct cam_path*path;
-intstatus,retval = 0;
-
-status = xpt_create_path(path, NULL, vbus_ext-sim-path_id, id, 0);
-if (status == CAM_REQ_CMP) {
- if((periph = cam_periph_find(path, da)) != NULL){
- if(periph-refcount = 1)
- retval = -1;
- }
- xpt_free_path(path);
-}
-
-return retval;
+ return 0;
}
HPT_U8 os_get_vbus_seq(void *osext)
Modified: stable/9/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
==
--- stable/9/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
+++ stable/9/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Sat Jun 14 00:54:57 2014
(r267458)
@@ -474,6 +474,16 @@ static void os_cmddone(PCOMMAND pCmd)
static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
{
+ POS_CMDEXT ext = (POS_CMDEXT)pCmd-priv;
+ union ccb *ccb = ext-ccb;
+
+ if (logical) {
+ os_set_sgptr(pSg, (HPT_U8 *)ccb-csio.data_ptr);
+ pSg-size = ccb-csio.dxfer_len;
+ pSg-eot = 1;
+ return TRUE;
+ }
+
/* since we have provided physical sg, nobody will ask us to build
physical sg */
HPT_ASSERT(0);
return FALSE;
@@ -547,7 +557,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_e
vd = ldm_find_target(vbus, ccb-ccb_h.target_id);
if (!vd) {
- ccb-ccb_h.status = CAM_TID_INVALID;
+ ccb-ccb_h.status = CAM_SEL_TIMEOUT;
xpt_done(ccb);
return;
}
Modified: stable/9/sys/dev/hptmv/entry.c
==
--- stable/9/sys/dev/hptmv/entry.c Sat Jun 14 00:44:57 2014
(r267457)
+++ stable/9/sys/dev/hptmv/entry.c Sat Jun 14 00:54:57 2014
(r267458)
@@ -2015,7 +2015,7 @@ hpt_probe(device_t dev)
{
KdPrintI((CONTROLLER_NAME found\n));
device_set_desc(dev, CONTROLLER_NAME);
- return 0;
+ return (BUS_PROBE_DEFAULT);
}
else
return(ENXIO);
@@ -2622,7 +2622,14 @@ launch_worker_thread(void)
int HPTLIBAPI fOsBuildSgl(_VBUS_ARG PCommand pCmd, FPSCAT_GATH pSg, int
logical)
{
-
+ union ccb *ccb = (union ccb *)pCmd-pOrgCommand;
+
+ if (logical) {
+ pSg-dSgAddress = (ULONG_PTR)(UCHAR *)ccb-csio.data_ptr;
+ pSg-wSgSize = ccb-csio.dxfer_len;
+ pSg-wSgFlag = SG_FLAG_EOT;
+ return TRUE;
+ }
/* since we have provided physical sg, nobody will ask us to build
physical sg */
HPT_ASSERT(0);
return FALSE;
Modified: stable/9/sys/dev/hptrr/hptrr_os_bsd.c
==
--- stable/9/sys/dev/hptrr/hptrr_os_bsd.c Sat Jun 14 00:44:57 2014
(r267457)
+++ stable/9/sys/dev/hptrr/hptrr_os_bsd.c Sat Jun 14 00:54:57 2014
(r267458)
@@ -256,21 +256,7 @@ int os_revalidate_device(void *osext, in
int os_query_remove_device(void *osext, int id)
{
- PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
- struct cam_periph *periph = NULL;
-struct cam_path*path;
-int
svn commit: r267459 - head/release
Author: gjb
Date: Sat Jun 14 01:03:24 2014
New Revision: 267459
URL: http://svnweb.freebsd.org/changeset/base/267459
Log:
Switch release/Makefile knobs from WITHOUT_FOO=1 to MK_FOO=no.
This allows greater granular control over the release
build, and avoids WITH_FOO=1 and WITHOUT_FOO=1 collision.
This change was verified to produce correct results
compared to an earlier build by diffing find(1) output
of the resulting bootonly/, dvd/, and release/ directories.
Tested on:head@r267449
MFC after:1 month
X-MFC-Note: Requires commits not yet MFC'd, so likely
longer than 1 month.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Sat Jun 14 00:54:57 2014(r267458)
+++ head/release/Makefile Sat Jun 14 01:03:24 2014(r267459)
@@ -154,8 +154,8 @@ system: packagesystem
# Install system
mkdir -p release
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
+ DESTDIR=${.OBJDIR}/release MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
+ MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no
# Copy distfiles
mkdir -p release/usr/freebsd-dist
cp *.txz MANIFEST release/usr/freebsd-dist
@@ -175,12 +175,12 @@ bootonly: packagesystem
# Install system
mkdir -p bootonly
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \
- WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
- WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
- WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
- WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
- WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no
+ DESTDIR=${.OBJDIR}/bootonly MK_AMD=no MK_AT=no \
+ MK_GAMES=no MK_GROFF=no \
+ MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
+ MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
+ MK_INSTALLIB=no MK_RESCUE=no MK_DICT=no \
+ MK_KERNEL_SYMBOLS=no MK_TESTS=no
# Copy manifest only (no distfiles) to get checksums
mkdir -p bootonly/usr/freebsd-dist
cp MANIFEST bootonly/usr/freebsd-dist
@@ -199,7 +199,7 @@ dvd:
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
+ DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no
\
MK_TESTS=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267460 - head/contrib/tzdata
Author: edwin Date: Sat Jun 14 01:18:02 2014 New Revision: 267460 URL: http://svnweb.freebsd.org/changeset/base/267460 Log: Undo commit r267455, which was done in the wrong directory. Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sat Jun 14 01:03:24 2014(r267459) +++ head/contrib/tzdata/africa Sat Jun 14 01:18:02 2014(r267460) @@ -239,13 +239,13 @@ Rule Egypt 19901994- May 1 1:001:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # /a Rule Egypt 19952010- Apr lastFri 0:00s 1:00S -Rule Egypt 19952005- Sep lastThu 24:00 0 - +Rule Egypt 19952005- Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006only- Sep 21 24:00 0 - +Rule Egypt 2006only- Sep 21 23:00s 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ RuleEgypt 2006only- Sep 21 24:00 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm -Rule Egypt 2007only- Sep Thu=1 24:00 0 - +Rule Egypt 2007only- Sep Thu=1 23:00s 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,77 +342,46 @@ Rule Egypt 2007only- Sep Thu=1 24:00 # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May midnight (24:00) -# From Imed Chihi (2014-06-04): -# We have finally located a precise official reference about the DST changes -# in Egypt. The Ministers Cabinet decision is explained at -# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... -# [T]his (Arabic) site is not accessible outside Egypt, but the page ... -# translates into: With regard to daylight saving time, it is scheduled to -# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, -# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, -# and re-established again at the end of the month of Ramadan, at twelve -# o'clock on the evening of Thursday, 31 JUL 2014. This statement has been -# reproduced by other (more accessible) sites[, e.g.,]... -# http://elgornal.net/news/news.aspx?id=4699258 - -# From Paul Eggert (2014-06-04): +# From Paul Eggert (2014-05-13): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. There is -# no information about when DST will end this fall. See: +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later spring and fall transitions will use -# 2010's rules, and guess that Egypt will switch to standard time at -# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the -# first Friday after Ramadan. To implement this, -# transition dates for 2015 through 2037 were determined by running -# the following program under GNU Emacs 24.3, with the results integrated -# by hand into the table below. Ramadan again intrudes on the guessed -# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff. -# (let ((islamic-year 1436)) -# (while ( islamic-year 1460) -# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (friday 5)) -# (while (/= friday (mod a 7)) -# (setq a (1- a))) -# (while (/= friday (mod b 7)) -# (setq b (1+ b))) -# (setq a (1- a)) -# (setq b (1- b)) -# (setq a
svn commit: r267461 - vendor/tzdata/tzdata2013e
Author: edwin Date: Sat Jun 14 01:24:16 2014 New Revision: 267461 URL: http://svnweb.freebsd.org/changeset/base/267461 Log: Remove wrongly tagged distribution. Deleted: vendor/tzdata/tzdata2013e/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267463 - stable/9/usr.sbin/daemon
Author: emaste
Date: Sat Jun 14 01:32:48 2014
New Revision: 267463
URL: http://svnweb.freebsd.org/changeset/base/267463
Log:
MFC r264194: fix handling of -P without -p or -r
Fork a child process and wait until the process terminates when the -P
option is specified. This behavior is documented on the manual page.
PR: 187265, 190643
Approved by: re
Modified:
stable/9/usr.sbin/daemon/daemon.c
Directory Properties:
stable/9/usr.sbin/daemon/ (props changed)
Modified: stable/9/usr.sbin/daemon/daemon.c
==
--- stable/9/usr.sbin/daemon/daemon.c Sat Jun 14 01:24:22 2014
(r267462)
+++ stable/9/usr.sbin/daemon/daemon.c Sat Jun 14 01:32:48 2014
(r267463)
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
* get SIGCHLD eventually.
*/
pid = -1;
- if (pidfile != NULL || restart) {
+ if (pidfile != NULL || ppidfile != NULL || restart) {
/*
* Restore default action for SIGTERM in case the
* parent process decided to ignore it.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267464 - head/usr.bin/patch
Author: pfg
Date: Sat Jun 14 01:58:33 2014
New Revision: 267464
URL: http://svnweb.freebsd.org/changeset/base/267464
Log:
patch: cleanup some unnecessary cruft.
- Drop some bogus casts to size_t.
- The new_p_foo variables are not needed after r267426.
Pointed out by: bde
MFC after:1 week
Modified:
head/usr.bin/patch/pch.c
Modified: head/usr.bin/patch/pch.c
==
--- head/usr.bin/patch/pch.cSat Jun 14 01:32:48 2014(r267463)
+++ head/usr.bin/patch/pch.cSat Jun 14 01:58:33 2014(r267464)
@@ -132,11 +132,11 @@ void
set_hunkmax(void)
{
if (p_line == NULL)
- p_line = malloc((size_t) hunkmax * sizeof(char *));
+ p_line = malloc(hunkmax * sizeof(char *));
if (p_len == NULL)
- p_len = malloc((size_t) hunkmax * sizeof(short));
+ p_len = malloc(hunkmax * sizeof(short));
if (p_char == NULL)
- p_char = malloc((size_t) hunkmax * sizeof(char));
+ p_char = malloc(hunkmax * sizeof(char));
}
/*
@@ -145,23 +145,14 @@ set_hunkmax(void)
static void
grow_hunkmax(void)
{
- int new_hunkmax;
- char**new_p_line;
- short *new_p_len;
- char*new_p_char;
-
- new_hunkmax = hunkmax * 2;
+ int new_hunkmax = hunkmax * 2;
if (p_line == NULL || p_len == NULL || p_char == NULL)
fatal(Internal memory allocation error\n);
- new_p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
- new_p_len = reallocf(p_len, new_hunkmax * sizeof(short));
- new_p_char = reallocf(p_char, new_hunkmax * sizeof(char));
-
- p_char = new_p_char;
- p_len = new_p_len;
- p_line = new_p_line;
+ p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
+ p_len = reallocf(p_len, new_hunkmax * sizeof(short));
+ p_char = reallocf(p_char, new_hunkmax * sizeof(char));
if (p_line != NULL p_len != NULL p_char != NULL) {
hunkmax = new_hunkmax;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267465 - in stable/10: include include/xlocale lib/libc/string sys/sys
Author: pfg
Date: Sat Jun 14 02:57:40 2014
New Revision: 267465
URL: http://svnweb.freebsd.org/changeset/base/267465
Log:
MFC r266865;
Fix strcasecmp_l() and strncasecmp_l() POSIX 2008 compliance.
POSIX.1-2008 specifies that those two functions should be declared by
including strings.h, not string.h (the latter only has strcoll_l()
and strxfrm_l()):
http://pubs.opengroup.org/onlinepubs/9699919799/functions/strcasecmp.html
Bump __FreeBSD_version for ports that may be using the non-standard
reference.
Obtained from:DragonFlyBSD
Reviewed by: theraven
Added:
stable/10/include/xlocale/_strings.h
- copied unchanged from r266865, head/include/xlocale/_strings.h
Modified:
stable/10/include/strings.h
stable/10/include/xlocale/Makefile
stable/10/include/xlocale/_string.h
stable/10/lib/libc/string/strcasecmp.3
stable/10/sys/sys/param.h
Modified: stable/10/include/strings.h
==
--- stable/10/include/strings.h Sat Jun 14 01:58:33 2014(r267464)
+++ stable/10/include/strings.h Sat Jun 14 02:57:40 2014(r267465)
@@ -59,6 +59,10 @@ char *rindex(const char *, int) __pure;
#endif
int strcasecmp(const char *, const char *) __pure;
int strncasecmp(const char *, const char *, size_t) __pure;
+
+#if __POSIX_VISIBLE = 200809 || defined(_XLOCALE_H_)
+#include xlocale/_strings.h
+#endif
__END_DECLS
#endif /* _STRINGS_H_ */
Modified: stable/10/include/xlocale/Makefile
==
--- stable/10/include/xlocale/Makefile Sat Jun 14 01:58:33 2014
(r267464)
+++ stable/10/include/xlocale/Makefile Sat Jun 14 02:57:40 2014
(r267465)
@@ -2,7 +2,7 @@
NO_OBJ=
INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\
- _stdlib.h _string.h _time.h _uchar.h _wchar.h
+ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h
INCSDIR=${INCLUDEDIR}/xlocale
.include bsd.prog.mk
Modified: stable/10/include/xlocale/_string.h
==
--- stable/10/include/xlocale/_string.h Sat Jun 14 01:58:33 2014
(r267464)
+++ stable/10/include/xlocale/_string.h Sat Jun 14 02:57:40 2014
(r267465)
@@ -53,9 +53,7 @@ size_t strxfrm_l(char *, const char *,
#ifdef _XLOCALE_H_
#ifndef _XLOCALE_STRING2_H
#define _XLOCALE_STRING2_H
-int strcasecmp_l(const char *, const char *, locale_t);
char *strcasestr_l(const char *, const char *, locale_t);
-int strncasecmp_l(const char *, const char *, size_t, locale_t);
#endif /* _XLOCALE_STRING2_H */
#endif /* _XLOCALE_H_ */
Copied: stable/10/include/xlocale/_strings.h (from r266865,
head/include/xlocale/_strings.h)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/include/xlocale/_strings.hSat Jun 14 02:57:40 2014
(r267465, copy of r266865, head/include/xlocale/_strings.h)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2011, 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _LOCALE_T_DEFINED
+#define _LOCALE_T_DEFINED
+typedef struct _xlocale *locale_t;
+#endif
+
+/*
+ * This file is included from both strings.h and xlocale.h. We need to expose
+ * the declarations unconditionally if we are included from xlocale.h, but only
+ * if we are in POSIX2008 mode if included from string.h.
+ */
+
+#ifndef _XLOCALE_STRINGS1_H
+#define _XLOCALE_STRINGS1_H
+
+/*
+ * POSIX2008 functions
+ */
+int
