svn commit: r228946 - head/share/misc
Author: bapt Date: Thu Dec 29 08:13:11 2011 New Revision: 228946 URL: http://svn.freebsd.org/changeset/base/228946 Log: I'm not yet an alumni, add myself in the right section Approved by: des (mentor) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Thu Dec 29 06:07:24 2011 (r228945) +++ head/share/misc/committers-src.dot Thu Dec 29 08:13:11 2011 (r228946) @@ -34,7 +34,6 @@ archie [label=Archie Cobbs\narchie@Free arr [label=Andrew R. Reiter\n...@freebsd.org\n2001/11/02\n2005/05/25] arun [label=Arun Sharma\na...@freebsd.org\n2003/03/06\n2006/12/16] asmodai [label=Jeroen Ruigrok\nasmo...@freebsd.org\n1999/12/16\n2001/11/16] -bapt [label=Baptiste Daroussin\nb...@freebsd.org\n2011/12/23] benjsc [label=Benjamin Close\nben...@freebsd.org\n2007/02/09\n2010/09/15] billf [label=Bill Fumerola\nbi...@freebsd.org\n1998/11/11\n2008/11/10] bmah [label=Bruce A. Mah\nb...@freebsd.org\n2002/01/29\n2009/09/13] @@ -102,6 +101,7 @@ antoine [label=Antoine Brodin\nantoine@ ariff [label=Ariff Abdullah\nar...@freebsd.org\n2005/11/14] art [label=Artem Belevich\n...@freebsd.org\n2011/03/29] avg [label=Andriy Gapon\n...@freebsd.org\n2009/02/18] +bapt [label=Baptiste Daroussin\nb...@freebsd.org\n2011/12/23] benl [label=Ben Laurie\nb...@freebsd.org\n2011/05/18] benno [label=Benno Rice\nbe...@freebsd.org\n2000/11/02] bms [label=Bruce M Simpson\n...@freebsd.org\n2003/08/06] ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228947 - head/sys/dev/uart
Author: kib
Date: Thu Dec 29 08:27:37 2011
New Revision: 228947
URL: http://svn.freebsd.org/changeset/base/228947
Log:
Add PCI Id for the Intel AMT serial interface as found on my DQ67OW.
MFC after:1 week
Modified:
head/sys/dev/uart/uart_bus_pci.c
Modified: head/sys/dev/uart/uart_bus_pci.c
==
--- head/sys/dev/uart/uart_bus_pci.cThu Dec 29 08:13:11 2011
(r228946)
+++ head/sys/dev/uart/uart_bus_pci.cThu Dec 29 08:27:37 2011
(r228947)
@@ -111,6 +111,7 @@ static struct pci_id pci_ns8250_ids[] =
{ 0x1415, 0x950b, 0x, 0, Oxford Semiconductor OXCB950 Cardbus 16950 UART,
0x10, 16384000 },
{ 0x151f, 0x, 0x, 0, TOPIC Semiconductor TP560 56k modem, 0x10 },
+{ 0x8086, 0x1c3d, 0x, 0, Intel AMT - KT Controller, 0x10 },
{ 0x9710, 0x9820, 0x1000, 1, NetMos NM9820 Serial Port, 0x10 },
{ 0x9710, 0x9835, 0x1000, 1, NetMos NM9835 Serial Port, 0x10 },
{ 0x9710, 0x9865, 0xa000, 0x1000, NetMos NM9865 Serial Port, 0x10 },
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228925 - head/sys/mips/cavium
On Wed, 28 Dec 2011 19:20:31 -0800
Oleksandr Tymoshenko go...@freebsd.org wrote:
On 28/12/2011 2:15 AM, Aleksandr Rybalko wrote:
On Wed, 28 Dec 2011 05:57:03 + (UTC)
Oleksandr Tymoshenkogo...@freebsd.org wrote:
Author: gonzo
Date: Wed Dec 28 05:57:03 2011
New Revision: 228925
URL: http://svn.freebsd.org/changeset/base/228925
Log:
- Add generic GPIO driver for Cavium Octeon. At the moment pin
definition is hardcoded but will be changed later with more
flexible way to define them.
/* __OCTEON_GPIOVAR_H__ */
Thank you very much Oleksandr!
Oleksandr, can you please avoid define board depended futures in
a SoC drivers in future '{ F/D, 7, GPIO_PIN_INPUT}'? So others
will be able to use driver in different boards w/o modification
(just by define it in hints/FDT or so).
OK, I'll remove it soon. It supposed to be just example.
Thanks again!
it just confuse peoples a bit, even developers.
i remember adri say many words about it when he remove board depended
struct from atheros gpio driver :)
Anyway thanks!
I will try to use/modify it ASAP and will send patches for review to
you and my mentor of course.
--
Alexandr Rybalko r...@dlink.ua
aka Alex RAY r...@ddteam.net
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228961 - head/sys/dev/acpica
Author: jhb Date: Thu Dec 29 16:23:14 2011 New Revision: 228961 URL: http://svn.freebsd.org/changeset/base/228961 Log: Further relax the strictness of enforcing allocations to only come from decoded ranges. Pass any request for a specific range that fails because it is not in a decoded range for an ACPI Host-PCI bridge up to the parent to see if it can still be allocated. This is based on the assumption that many BIOSes are inconsistent/broken and that settings programmed into BARs or resources assigned to other built-in components are more trustworthy than the list of decoded resource ranges in _CRS. This effectively limits the decoded ranges to only being used for wildcard ranges when allocating fresh resources for a BAR, etc. At some point I would like to only be this permissive during an early scan of firmware-assigned resources during boot and to be strict about all later allocations, but that isn't viable currently. MFC after:2 weeks Modified: head/sys/dev/acpica/acpi_pcib_acpi.c Modified: head/sys/dev/acpica/acpi_pcib_acpi.c == --- head/sys/dev/acpica/acpi_pcib_acpi.cThu Dec 29 16:17:16 2011 (r228960) +++ head/sys/dev/acpica/acpi_pcib_acpi.cThu Dec 29 16:23:14 2011 (r228961) @@ -511,8 +511,17 @@ acpi_pcib_acpi_alloc_resource(device_t d sc = device_get_softc(dev); res = pcib_host_res_alloc(sc-ap_host_res, child, type, rid, start, end, count, flags); + +/* + * XXX: If this is a request for a specific range, assume it is + * correct and pass it up to the parent. What we probably want to + * do long-term is explicitly trust any firmware-configured + * resources during the initial bus scan on boot and then disable + * this after that. + */ if (res == NULL start + count - 1 == end) - res = acpi_alloc_sysres(child, type, rid, start, end, count, flags); + res = bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags); return (res); #else return (bus_generic_alloc_resource(dev, child, type, rid, start, end, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228955 - head/include
On Thu, Dec 29, 2011 at 07:32:13PM +0100, Ed Schouten wrote: Hi Andreas, * Andreas Tobler andre...@freebsd.org, 20111229 18:43: Thank you Ed! gcc-4.6 bootstrap successful. But it seems GCC 4.7 is still broken. I am not planning to fix that, because it's a shortcoming of GCC. As soon as the GNU folks implement C++11 [[noreturn]], it should work again. Are you going to submit a bug report to GCC? Because, as of now, you've broken my ability to do development work on bleeding edge freebsd and bleeding edge gcc. -- Steve ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228955 - head/include
Hi Steve, * Steve Kargl s...@troutmask.apl.washington.edu, 20111229 19:49: Are you going to submit a bug report to GCC? Because, as of now, you've broken my ability to do development work on bleeding edge freebsd and bleeding edge gcc. Here you go: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51705 In the future, could you write such bug reports yourself? I am really not that interested in GCC's development process. -- Ed Schouten e...@80386.nl WWW: http://80386.nl/ pgph1SaQdSq96.pgp Description: PGP signature
svn commit: r228967 - head/sys/net
Author: yongari
Date: Thu Dec 29 18:40:58 2011
New Revision: 228967
URL: http://svn.freebsd.org/changeset/base/228967
Log:
Update if_obytes and if_omcast after successful transmit.
While I'm here update if_oerrors if parent interface of vlan is not
up and running. Previously it updated collision counter and it was
confusing to interprete it.
PR: kern/163478
Reviewed by: glebius, jhb
Tested by:Joe Holden lists rewt dot org dot uk
Modified:
head/sys/net/if_vlan.c
Modified: head/sys/net/if_vlan.c
==
--- head/sys/net/if_vlan.c Thu Dec 29 18:25:18 2011(r228966)
+++ head/sys/net/if_vlan.c Thu Dec 29 18:40:58 2011(r228967)
@@ -1012,10 +1012,12 @@ vlan_transmit(struct ifnet *ifp, struct
{
struct ifvlan *ifv;
struct ifnet *p;
- int error;
+ int error, len, mcast;
ifv = ifp-if_softc;
p = PARENT(ifv);
+ len = m-m_pkthdr.len;
+ mcast = (m-m_flags (M_MCAST | M_BCAST)) ? 1 : 0;
BPF_MTAP(ifp, m);
@@ -1025,7 +1027,7 @@ vlan_transmit(struct ifnet *ifp, struct
*/
if (!UP_AND_RUNNING(p)) {
m_freem(m);
- ifp-if_collisions++;
+ ifp-if_oerrors++;
return (0);
}
@@ -1081,9 +1083,11 @@ vlan_transmit(struct ifnet *ifp, struct
* Send it, precisely as ether_output() would have.
*/
error = (p-if_transmit)(p, m);
- if (!error)
+ if (!error) {
ifp-if_opackets++;
- else
+ ifp-if_omcasts += mcast;
+ ifp-if_obytes += len;
+ } else
ifp-if_oerrors++;
return (error);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228955 - head/include
On 29.12.11 15:41, Ed Schouten wrote: Author: ed Date: Thu Dec 29 14:41:17 2011 New Revision: 228955 URL: http://svn.freebsd.org/changeset/base/228955 Log: Don't define static_assert for C++. Even though _Static_assert() is pretty robust for C code, it cannot work correctly with C++ code. This is due to the fact that C++ template parameters may contain commas that are not enclosed in parentheses. For example: static_assert(fooint, int::bar == baz, ...); This causes _Static_assert to be called with an excessive number of parameters. If you want to use static_assert in C++, just use a C++11 compiler. Reported on: current@, ports@ Thank you Ed! gcc-4.6 bootstrap successful. Andreas ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228958 - in head/sys: amd64/linux32 i386/linux
Author: jhb
Date: Thu Dec 29 15:35:47 2011
New Revision: 228958
URL: http://svn.freebsd.org/changeset/base/228958
Log:
Regen.
Modified:
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_syscall.h
head/sys/amd64/linux32/linux32_syscalls.c
head/sys/amd64/linux32/linux32_sysent.c
head/sys/amd64/linux32/linux32_systrace_args.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_syscall.h
head/sys/i386/linux/linux_syscalls.c
head/sys/i386/linux/linux_sysent.c
head/sys/i386/linux/linux_systrace_args.c
Modified: head/sys/amd64/linux32/linux32_proto.h
==
--- head/sys/amd64/linux32/linux32_proto.h Thu Dec 29 15:34:59 2011
(r228957)
+++ head/sys/amd64/linux32/linux32_proto.h Thu Dec 29 15:35:47 2011
(r228958)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693
2011-11-19 07:19:37Z ed
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957
2011-12-29 15:34:59Z jhb
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -756,7 +756,10 @@ struct linux_set_thread_area_args {
char desc_l_[PADL_(struct l_user_desc *)]; struct l_user_desc * desc;
char desc_r_[PADR_(struct l_user_desc *)];
};
struct linux_fadvise64_args {
- register_t dummy;
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
+ char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
+ char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct linux_exit_group_args {
char error_code_l_[PADL_(int)]; int error_code; char
error_code_r_[PADR_(int)];
@@ -830,7 +833,10 @@ struct linux_utimes_args {
char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char
tptr_r_[PADR_(struct l_timeval *)];
};
struct linux_fadvise64_64_args {
- register_t dummy;
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
+ char len_l_[PADL_(l_loff_t)]; l_loff_t len; char
len_r_[PADR_(l_loff_t)];
+ char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct linux_mbind_args {
register_t dummy;
Modified: head/sys/amd64/linux32/linux32_syscall.h
==
--- head/sys/amd64/linux32/linux32_syscall.hThu Dec 29 15:34:59 2011
(r228957)
+++ head/sys/amd64/linux32/linux32_syscall.hThu Dec 29 15:35:47 2011
(r228958)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693
2011-11-19 07:19:37Z ed
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957
2011-12-29 15:34:59Z jhb
*/
#defineLINUX_SYS_exit 1
Modified: head/sys/amd64/linux32/linux32_syscalls.c
==
--- head/sys/amd64/linux32/linux32_syscalls.c Thu Dec 29 15:34:59 2011
(r228957)
+++ head/sys/amd64/linux32/linux32_syscalls.c Thu Dec 29 15:35:47 2011
(r228958)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693
2011-11-19 07:19:37Z ed
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957
2011-12-29 15:34:59Z jhb
*/
const char *linux_syscallnames[] = {
Modified: head/sys/amd64/linux32/linux32_sysent.c
==
--- head/sys/amd64/linux32/linux32_sysent.c Thu Dec 29 15:34:59 2011
(r228957)
+++ head/sys/amd64/linux32/linux32_sysent.c Thu Dec 29 15:35:47 2011
(r228958)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693
2011-11-19 07:19:37Z ed
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 228957
2011-12-29 15:34:59Z jhb
*/
#include opt_compat.h
@@ -269,7 +269,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 247 = linux_io_getevents */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 248 = linux_io_submit */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 249 = linux_io_cancel */
- { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC },/* 250 = linux_fadvise64 */
+ { AS(linux_fadvise64_args), (sy_call_t *)linux_fadvise64,
svn commit: r228960 - head/sys/kern
Author: jhb
Date: Thu Dec 29 16:17:16 2011
New Revision: 228960
URL: http://svn.freebsd.org/changeset/base/228960
Log:
Cap the priority calculated from the current thread's running tick count
at SCHED_PRI_RANGE to prevent overflows in the priority value. This can
happen due to irregularities with clock interrupts under certain
virtualization environments.
Tested by:Larry Rosenman ler lerctr org
MFC after:2 weeks
Modified:
head/sys/kern/sched_ule.c
Modified: head/sys/kern/sched_ule.c
==
--- head/sys/kern/sched_ule.c Thu Dec 29 15:59:14 2011(r228959)
+++ head/sys/kern/sched_ule.c Thu Dec 29 16:17:16 2011(r228960)
@@ -1434,7 +1434,8 @@ sched_priority(struct thread *td)
} else {
pri = SCHED_PRI_MIN;
if (td-td_sched-ts_ticks)
- pri += SCHED_PRI_TICKS(td-td_sched);
+ pri += min(SCHED_PRI_TICKS(td-td_sched),
+ SCHED_PRI_RANGE);
pri += SCHED_PRI_NICE(td-td_proc-p_nice);
KASSERT(pri = PRI_MIN_BATCH pri = PRI_MAX_BATCH,
(sched_priority: invalid priority %d: nice %d,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228956 - head/tools/tools/netrate/tcpp
Author: rwatson Date: Thu Dec 29 15:34:59 2011 New Revision: 228956 URL: http://svn.freebsd.org/changeset/base/228956 Log: Fix typo in comment. MFC after:3 days Modified: head/tools/tools/netrate/tcpp/tcpp_client.c Modified: head/tools/tools/netrate/tcpp/tcpp_client.c == --- head/tools/tools/netrate/tcpp/tcpp_client.c Thu Dec 29 14:41:17 2011 (r228955) +++ head/tools/tools/netrate/tcpp/tcpp_client.c Thu Dec 29 15:34:59 2011 (r228956) @@ -99,7 +99,7 @@ tcpp_client_newconn(void) int fd, i; /* -* Spread load over available IPs, roating through them as we go. No +* Spread load over available IPs, rotating through them as we go. No * attempt to localize IPs to particular workers. */ sin = localipbase; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228963 - in head/sys/dev: ce cp
Author: dim
Date: Thu Dec 29 17:46:24 2011
New Revision: 228963
URL: http://svn.freebsd.org/changeset/base/228963
Log:
Fix clang warnings in sys/dev/ce/if_ce.c and sys/dev/cp/if_cp.c,
using jkim's last patch (reviewed by bde) from here:
http://docs.freebsd.org/cgi/mid.cgi?201010141558.03154.jkim
MFC after:1 week
Modified:
head/sys/dev/ce/if_ce.c
head/sys/dev/cp/if_cp.c
Modified: head/sys/dev/ce/if_ce.c
==
--- head/sys/dev/ce/if_ce.c Thu Dec 29 16:40:54 2011(r228962)
+++ head/sys/dev/ce/if_ce.c Thu Dec 29 17:46:24 2011(r228963)
@@ -1313,9 +1313,11 @@ static int ce_ioctl (struct cdev *dev, u
IFP2SP(d-ifp)-pp_flags = ~(PP_FR);
IFP2SP(d-ifp)-pp_flags |= PP_KEEPALIVE;
d-ifp-if_flags |= PP_CISCO;
- } else if (! strcmp (fr, (char*)data) PP_FR) {
+#if PP_FR != 0
+ } else if (! strcmp (fr, (char*)data)) {
d-ifp-if_flags = ~(PP_CISCO);
IFP2SP(d-ifp)-pp_flags |= PP_FR | PP_KEEPALIVE;
+#endif
} else if (! strcmp (ppp, (char*)data)) {
IFP2SP(d-ifp)-pp_flags = ~PP_FR;
IFP2SP(d-ifp)-pp_flags = ~PP_KEEPALIVE;
Modified: head/sys/dev/cp/if_cp.c
==
--- head/sys/dev/cp/if_cp.c Thu Dec 29 16:40:54 2011(r228962)
+++ head/sys/dev/cp/if_cp.c Thu Dec 29 17:46:24 2011(r228963)
@@ -1052,9 +1052,11 @@ static int cp_ioctl (struct cdev *dev, u
IFP2SP(d-ifp)-pp_flags = ~(PP_FR);
IFP2SP(d-ifp)-pp_flags |= PP_KEEPALIVE;
d-ifp-if_flags |= PP_CISCO;
- } else if (! strcmp (fr, (char*)data) PP_FR) {
+#if PP_FR != 0
+ } else if (! strcmp (fr, (char*)data)) {
d-ifp-if_flags = ~(PP_CISCO);
IFP2SP(d-ifp)-pp_flags |= PP_FR | PP_KEEPALIVE;
+#endif
} else if (! strcmp (ppp, (char*)data)) {
IFP2SP(d-ifp)-pp_flags = ~PP_FR;
IFP2SP(d-ifp)-pp_flags = ~PP_KEEPALIVE;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228953 - in head/tools: regression/pthread/mutex_isowned_np tools/ansify tools/genericize tools/hcomp tools/mtxstat tools/prstats tools/whereintheworld
I know :) Making my way through them one subdir at a time... Cheers Uli ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228955 - head/include
Author: ed Date: Thu Dec 29 14:41:17 2011 New Revision: 228955 URL: http://svn.freebsd.org/changeset/base/228955 Log: Don't define static_assert for C++. Even though _Static_assert() is pretty robust for C code, it cannot work correctly with C++ code. This is due to the fact that C++ template parameters may contain commas that are not enclosed in parentheses. For example: static_assert(fooint, int::bar == baz, ...); This causes _Static_assert to be called with an excessive number of parameters. If you want to use static_assert in C++, just use a C++11 compiler. Reported on: current@, ports@ Modified: head/include/assert.h Modified: head/include/assert.h == --- head/include/assert.h Thu Dec 29 12:33:41 2011(r228954) +++ head/include/assert.h Thu Dec 29 14:41:17 2011(r228955) @@ -58,7 +58,16 @@ #ifndef _ASSERT_H_ #define _ASSERT_H_ -#if __ISO_C_VISIBLE = 2011 (!defined(__cplusplus) || __cplusplus 201103L) +/* + * Static assertions. In principle we could define static_assert for + * C++ older than C++11, but this breaks if _Static_assert is + * implemented as a macro. + * + * C++ template parameters may contain commas, even if not enclosed in + * parentheses, causing the _Static_assert macro to be invoked with more + * than two parameters. + */ +#if __ISO_C_VISIBLE = 2011 !defined(__cplusplus) #definestatic_assert _Static_assert #endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228955 - head/include
Hi Ed, On 29.12.11 19:32, Ed Schouten wrote: * Andreas Toblerandre...@freebsd.org, 20111229 18:43: Thank you Ed! gcc-4.6 bootstrap successful. But it seems GCC 4.7 is still broken. I am not planning to fix that, because it's a shortcoming of GCC. As soon as the GNU folks implement C++11 [[noreturn]], it should work again. Yep, gcc-trunk is still broken. I help(ed) myself with a !defined(__GNUC__) with this I can continue hacking on trunk... Well, I possibly do not understand all/everything regarding this [[noreturn]]. But I do not see an activity in this direction on the gcc side. They implemented the _Noreturn for STDC but the double-square-bracket notation for noreturn C++ I do not see. As said, I might simply do not see it. Thanks again, Andreas ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228957 - in head/sys: amd64/linux32 compat/linux i386/linux
Author: jhb
Date: Thu Dec 29 15:34:59 2011
New Revision: 228957
URL: http://svn.freebsd.org/changeset/base/228957
Log:
Implement linux_fadvise64() and linux_fadvise64_64() using
kern_posix_fadvise().
Reviewed by: silence on emulation@
MFC after:2 weeks
Modified:
head/sys/amd64/linux32/linux.h
head/sys/amd64/linux32/linux32_dummy.c
head/sys/amd64/linux32/syscalls.master
head/sys/compat/linux/linux_file.c
head/sys/i386/linux/linux.h
head/sys/i386/linux/linux_dummy.c
head/sys/i386/linux/syscalls.master
Modified: head/sys/amd64/linux32/linux.h
==
--- head/sys/amd64/linux32/linux.h Thu Dec 29 15:34:59 2011
(r228956)
+++ head/sys/amd64/linux32/linux.h Thu Dec 29 15:34:59 2011
(r228957)
@@ -597,6 +597,16 @@ intlinux_ioctl_unregister_handler(struc
#defineLINUX_F_UNLCK 2
/*
+ * posix_fadvise advice
+ */
+#defineLINUX_POSIX_FADV_NORMAL 0
+#defineLINUX_POSIX_FADV_RANDOM 1
+#defineLINUX_POSIX_FADV_SEQUENTIAL 2
+#defineLINUX_POSIX_FADV_WILLNEED 3
+#defineLINUX_POSIX_FADV_DONTNEED 4
+#defineLINUX_POSIX_FADV_NOREUSE5
+
+/*
* mount flags
*/
#defineLINUX_MS_RDONLY 0x0001
Modified: head/sys/amd64/linux32/linux32_dummy.c
==
--- head/sys/amd64/linux32/linux32_dummy.c Thu Dec 29 15:34:59 2011
(r228956)
+++ head/sys/amd64/linux32/linux32_dummy.c Thu Dec 29 15:34:59 2011
(r228957)
@@ -59,7 +59,6 @@ DUMMY(setfsuid);
DUMMY(setfsgid);
DUMMY(pivot_root);
DUMMY(mincore);
-DUMMY(fadvise64);
DUMMY(ptrace);
DUMMY(lookup_dcookie);
DUMMY(epoll_create);
@@ -72,7 +71,6 @@ DUMMY(timer_gettime);
DUMMY(timer_getoverrun);
DUMMY(timer_delete);
DUMMY(fstatfs64);
-DUMMY(fadvise64_64);
DUMMY(mbind);
DUMMY(get_mempolicy);
DUMMY(set_mempolicy);
Modified: head/sys/amd64/linux32/syscalls.master
==
--- head/sys/amd64/linux32/syscalls.master Thu Dec 29 15:34:59 2011
(r228956)
+++ head/sys/amd64/linux32/syscalls.master Thu Dec 29 15:34:59 2011
(r228957)
@@ -419,7 +419,8 @@
247AUE_NULLUNIMPL linux_io_getevents
248AUE_NULLUNIMPL linux_io_submit
249AUE_NULLUNIMPL linux_io_cancel
-250AUE_NULLSTD { int linux_fadvise64(void); }
+250AUE_NULLSTD { int linux_fadvise64(int fd, l_loff_t offset, \
+ l_size_t len, int advice); }
251AUE_NULLUNIMPL
252AUE_EXITSTD { int linux_exit_group(int error_code); }
253AUE_NULLSTD { int linux_lookup_dcookie(void); }
@@ -443,7 +444,9 @@
270AUE_NULLSTD { int linux_tgkill(int tgid, int pid, int sig);
}
271AUE_UTIMES STD { int linux_utimes(char *fname, \
struct l_timeval *tptr); }
-272AUE_NULLSTD { int linux_fadvise64_64(void); }
+272AUE_NULLSTD { int linux_fadvise64_64(int fd, \
+ l_loff_t offset, l_loff_t len, \
+ int advice); }
273AUE_NULLUNIMPL
274AUE_NULLSTD { int linux_mbind(void); }
275AUE_NULLSTD { int linux_get_mempolicy(void); }
Modified: head/sys/compat/linux/linux_file.c
==
--- head/sys/compat/linux/linux_file.c Thu Dec 29 15:34:59 2011
(r228956)
+++ head/sys/compat/linux/linux_file.c Thu Dec 29 15:34:59 2011
(r228957)
@@ -1530,3 +1530,48 @@ linux_lchown(struct thread *td, struct l
LFREEPATH(path);
return (error);
}
+
+static int
+convert_fadvice(int advice)
+{
+ switch (advice) {
+ case LINUX_POSIX_FADV_NORMAL:
+ return (POSIX_FADV_NORMAL);
+ case LINUX_POSIX_FADV_RANDOM:
+ return (POSIX_FADV_RANDOM);
+ case LINUX_POSIX_FADV_SEQUENTIAL:
+ return (POSIX_FADV_SEQUENTIAL);
+ case LINUX_POSIX_FADV_WILLNEED:
+ return (POSIX_FADV_WILLNEED);
+ case LINUX_POSIX_FADV_DONTNEED:
+ return (POSIX_FADV_DONTNEED);
+ case LINUX_POSIX_FADV_NOREUSE:
+ return (POSIX_FADV_NOREUSE);
+ default:
+ return (-1);
+ }
+}
+
+int
+linux_fadvise64(struct thread *td, struct linux_fadvise64_args *args)
+{
+ int advice;
+
+ advice = convert_fadvice(args-advice);
+ if (advice == -1)
+ return (EINVAL);
+ return (kern_posix_fadvise(td, args-fd, args-offset, args-len,
+ advice));
+}
+
+int
+linux_fadvise64_64(struct thread *td, struct linux_fadvise64_64_args *args)
+{
+ int advice;
+
+
Re: svn commit: r228955 - head/include
Hi Andreas, * Andreas Tobler andre...@freebsd.org, 20111229 18:43: Thank you Ed! gcc-4.6 bootstrap successful. But it seems GCC 4.7 is still broken. I am not planning to fix that, because it's a shortcoming of GCC. As soon as the GNU folks implement C++11 [[noreturn]], it should work again. -- Ed Schouten e...@80386.nl WWW: http://80386.nl/ pgpoVMqDaK6lw.pgp Description: PGP signature
svn commit: r228962 - in head/sys: i386/i386 mips/mips
Author: jhb
Date: Thu Dec 29 16:40:54 2011
New Revision: 228962
URL: http://svn.freebsd.org/changeset/base/228962
Log:
Use curthread rather than PCPU_GET(curthread). 'curthread' uses
special-case optimizations on several platforms and is preferred.
Reported by: dim (indirectly)
MFC after:2 weeks
Modified:
head/sys/i386/i386/sys_machdep.c
head/sys/mips/mips/gdb_machdep.c
Modified: head/sys/i386/i386/sys_machdep.c
==
--- head/sys/i386/i386/sys_machdep.cThu Dec 29 16:23:14 2011
(r228961)
+++ head/sys/i386/i386/sys_machdep.cThu Dec 29 16:40:54 2011
(r228962)
@@ -553,7 +553,7 @@ user_ldt_free(struct thread *td)
return;
}
- if (td == PCPU_GET(curthread)) {
+ if (td == curthread) {
#ifdef XEN
i386_reset_ldt(default_proc_ldt);
PCPU_SET(currentldt, (int)default_proc_ldt);
Modified: head/sys/mips/mips/gdb_machdep.c
==
--- head/sys/mips/mips/gdb_machdep.cThu Dec 29 16:23:14 2011
(r228961)
+++ head/sys/mips/mips/gdb_machdep.cThu Dec 29 16:40:54 2011
(r228962)
@@ -116,7 +116,7 @@ gdb_cpu_getreg(int regnum, size_t *regsz
{
*regsz = gdb_cpu_regsz(regnum);
- if (kdb_thread == PCPU_GET(curthread)) {
+ if (kdb_thread == curthread) {
register_t *zero_ptr = kdb_frame-zero;
return zero_ptr + regnum;
}
@@ -154,7 +154,7 @@ gdb_cpu_setreg(int regnum, void *val)
switch (regnum) {
case GDB_REG_PC:
kdb_thrctx-pcb_context[10] = *(register_t *)val;
- if (kdb_thread == PCPU_GET(curthread))
+ if (kdb_thread == curthread)
kdb_frame-pc = *(register_t *)val;
}
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228953 - in head/tools: regression/pthread/mutex_isowned_np tools/ansify tools/genericize tools/hcomp tools/mtxstat tools/prstats tools/whereintheworld
Author: uqs Date: Thu Dec 29 12:33:27 2011 New Revision: 228953 URL: http://svn.freebsd.org/changeset/base/228953 Log: Reencode files from latin1 to UTF-8. Modified: head/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c head/tools/tools/ansify/ansify.pl head/tools/tools/genericize/genericize.pl head/tools/tools/hcomp/hcomp.pl head/tools/tools/mtxstat/mtxstat.pl head/tools/tools/prstats/prstats.pl head/tools/tools/whereintheworld/whereintheworld.pl Modified: head/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c == --- head/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c Thu Dec 29 12:28:05 2011(r228952) +++ head/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c Thu Dec 29 12:33:27 2011(r228953) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Dag-Erling Co�dan Sm�rgrav + * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/ansify/ansify.pl == --- head/tools/tools/ansify/ansify.pl Thu Dec 29 12:28:05 2011 (r228952) +++ head/tools/tools/ansify/ansify.pl Thu Dec 29 12:33:27 2011 (r228953) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2005 Dag-Erling Co�dan Sm�rgrav +# Copyright (c) 2005 Dag-Erling Coïdan Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/genericize/genericize.pl == --- head/tools/tools/genericize/genericize.pl Thu Dec 29 12:28:05 2011 (r228952) +++ head/tools/tools/genericize/genericize.pl Thu Dec 29 12:33:27 2011 (r228953) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2004 Dag-Erling Co�dan Sm�rgrav +# Copyright (c) 2004 Dag-Erling Coïdan Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/hcomp/hcomp.pl == --- head/tools/tools/hcomp/hcomp.pl Thu Dec 29 12:28:05 2011 (r228952) +++ head/tools/tools/hcomp/hcomp.pl Thu Dec 29 12:33:27 2011 (r228953) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2003 Dag-Erling Co�dan Sm�rgrav +# Copyright (c) 2003 Dag-Erling Coïdan Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/mtxstat/mtxstat.pl == --- head/tools/tools/mtxstat/mtxstat.pl Thu Dec 29 12:28:05 2011 (r228952) +++ head/tools/tools/mtxstat/mtxstat.pl Thu Dec 29 12:33:27 2011 (r228953) @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2002 Dag-Erling Co�dan Sm�rgrav +# Copyright (c) 2002 Dag-Erling Coïdan Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/prstats/prstats.pl == --- head/tools/tools/prstats/prstats.pl Thu Dec 29 12:28:05 2011 (r228952) +++ head/tools/tools/prstats/prstats.pl Thu Dec 29 12:33:27 2011 (r228953) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2001 Dag-Erling Co�dan Sm�rgrav +# Copyright (c) 2001 Dag-Erling Coïdan Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: head/tools/tools/whereintheworld/whereintheworld.pl == --- head/tools/tools/whereintheworld/whereintheworld.pl Thu Dec 29 12:28:05 2011(r228952) +++ head/tools/tools/whereintheworld/whereintheworld.pl Thu Dec 29 12:33:27 2011(r228953) @@ -4,7 +4,7 @@ # Parses make world output and summarize where it's been so far. # # Bill Fenner fen...@freebsd.org 11 January 2000 -# Dag-Erling Sm�rgrav d...@freebsd.org 09 January 2003 +# Dag-Erling Smørgrav d...@freebsd.org 09 January 2003 # # $Id: whereintheworld,v 1.3 2000/01/28 00:42:32 fenner Exp $ # $FreeBSD$ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228952 - head/sys/sys
Author: pluknet
Date: Thu Dec 29 12:28:05 2011
New Revision: 228952
URL: http://svn.freebsd.org/changeset/base/228952
Log:
Update LOCKLEAF comment: it should say vnode.
Inspired by PR docs/11596.
Modified:
head/sys/sys/namei.h
Modified: head/sys/sys/namei.h
==
--- head/sys/sys/namei.hThu Dec 29 11:38:02 2011(r228951)
+++ head/sys/sys/namei.hThu Dec 29 12:28:05 2011(r228952)
@@ -107,7 +107,7 @@ struct nameidata {
/*
* namei operational modifier flags, stored in ni_cnd.flags
*/
-#defineLOCKLEAF0x0004 /* lock inode on return */
+#defineLOCKLEAF0x0004 /* lock vnode on return */
#defineLOCKPARENT 0x0008 /* want parent vnode returned locked */
#defineWANTPARENT 0x0010 /* want parent vnode returned unlocked
*/
#defineNOCACHE 0x0020 /* name must not be left in cache */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228953 - in head/tools: regression/pthread/mutex_isowned_np tools/ansify tools/genericize tools/hcomp tools/mtxstat tools/prstats tools/whereintheworld
Hi Uli, * Ulrich Spoerlein u...@freebsd.org, 20111229 13:33: Reencode files from latin1 to UTF-8. I've got some more for you. ;-) crypto/openssh/FREEBSD-upgrade: line 119, char 1, byte offset 23: invalid UTF-8 code games/morse/morse.c: line 148, char 1, byte offset 4: invalid UTF-8 code gnu/usr.bin/cvs/contrib/easy-import.pl: line 9, char 1, byte offset 15: invalid UTF-8 code gnu/usr.bin/grep/AUTHORS: line 43, char 1, byte offset 24: invalid UTF-8 code gnu/usr.bin/groff/tmac/fr.ISO8859-1: line 32, char 1, byte offset 43: invalid UTF-8 code gnu/usr.bin/groff/tmac/hyphen.ru: line 7, char 1, byte offset 2: invalid UTF-8 code gnu/usr.bin/groff/tmac/ru.KOI8-R: line 29, char 1, byte offset 5: invalid UTF-8 code lib/libgssapi/gss_display_status.c: line 29, char 1, byte offset 49: invalid UTF-8 code lib/libgssapi/gss_pseudo_random.c: line 2, char 1, byte offset 42: invalid UTF-8 code lib/libgssapi/gss_release_oid.c: line 2, char 1, byte offset 42: invalid UTF-8 code lib/libutil/flopen.3: line 2, char 1, byte offset 37: invalid UTF-8 code lib/libutil/kld.3: line 2, char 1, byte offset 37: invalid UTF-8 code lib/libvgl/bitmap.c: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libvgl/keyboard.c: line 2, char 1, byte offset 24: invalid UTF-8 code lib/libvgl/main.c: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libvgl/mouse.c: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libvgl/simple.c: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libvgl/text.c: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libvgl/vgl.3: line 1, char 1, byte offset 25: invalid UTF-8 code lib/libvgl/vgl.h: line 2, char 1, byte offset 29: invalid UTF-8 code lib/libz/ChangeLog: line 303, char 1, byte offset 57: invalid UTF-8 code lib/libz/contrib/README.contrib: line 41, char 1, byte offset 22: invalid UTF-8 code lib/msun/src/s_fabsl.c: line 2, char 1, byte offset 36: invalid UTF-8 code release/picobsd/tinyware/view/fbsd.png: line 1, char 1, byte offset 1: invalid UTF-8 code share/colldef/map.ISCII-DEV: line 81, char 1, byte offset 58: invalid UTF-8 code share/doc/papers/devfs/paper.me: line 243, char 1, byte offset 15: invalid UTF-8 code share/doc/papers/timecounter/timecounter.ms: line 2, char 1, byte offset 7: invalid UTF-8 code share/misc/latin1: line 3, char 1, byte offset 15: invalid UTF-8 code share/misc/usb_hid_usages: line 1283, char 1, byte offset 22: invalid UTF-8 code share/syscons/fonts/INDEX.fonts: line 52, char 1, byte offset 10: invalid UTF-8 code share/syscons/keymaps/INDEX.keymaps: line 24, char 1, byte offset 16: invalid UTF-8 code share/syscons/keymaps/by.cp1131.kbd: line 120, char 1, byte offset 17: invalid UTF-8 code share/syscons/keymaps/by.cp1251.kbd: line 120, char 1, byte offset 17: invalid UTF-8 code share/syscons/keymaps/by.iso5.kbd: line 120, char 1, byte offset 17: invalid UTF-8 code share/syscons/keymaps/ce.iso2.kbd: line 31, char 1, byte offset 9: invalid UTF-8 code share/syscons/keymaps/colemak.iso15.acc.kbd: line 12, char 1, byte offset 38: invalid UTF-8 code share/syscons/keymaps/cs.latin2.qwertz.kbd: line 18, char 1, byte offset 55: invalid UTF-8 code share/syscons/keymaps/cz.iso2.kbd: line 38, char 1, byte offset 9: invalid UTF-8 code share/syscons/keymaps/el.iso07.kbd: line 20, char 1, byte offset 43: invalid UTF-8 code share/syscons/keymaps/fr.dvorak.acc.kbd: line 11, char 1, byte offset 8: invalid UTF-8 code share/syscons/keymaps/fr.dvorak.kbd: line 7, char 1, byte offset 8: invalid UTF-8 code share/syscons/keymaps/gr.elot.acc.kbd: line 13, char 1, byte offset 17: invalid UTF-8 code share/syscons/keymaps/norwegian.dvorak.kbd: line 33, char 1, byte offset 38: invalid UTF-8 code share/syscons/keymaps/sk.iso2.kbd: line 38, char 1, byte offset 9: invalid UTF-8 code share/syscons/keymaps/tr.iso9.q.kbd: line 24, char 1, byte offset 38: invalid UTF-8 code share/syscons/keymaps/ua.koi8-u.shift.alt.kbd: line 10, char 1, byte offset 11: invalid UTF-8 code sys/amd64/linux32/linux.h: line 4, char 1, byte offset 29: invalid UTF-8 code sys/amd64/linux32/linux32_dummy.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/amd64/linux32/linux32_sysvec.c: line 6, char 1, byte offset 29: invalid UTF-8 code sys/arm/at91/at91_st.c: line 203, char 1, byte offset 28: invalid UTF-8 code sys/arm/sa11x0/sa11x0_ost.c: line 254, char 1, byte offset 42: invalid UTF-8 code sys/compat/linux/linux_file.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/compat/linux/linux_ioctl.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/compat/linux/linux_ipc.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/compat/linux/linux_misc.c: line 3, char 1, byte offset 29: invalid UTF-8 code sys/compat/linux/linux_signal.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/compat/linux/linux_socket.c: line 2, char 1, byte offset 24: invalid UTF-8 code sys/compat/linux/linux_stats.c: line 2, char 1, byte offset 29: invalid UTF-8 code sys/compat
svn commit: r228959 - head/sys/netinet
Author: glebius
Date: Thu Dec 29 15:59:14 2011
New Revision: 228959
URL: http://svn.freebsd.org/changeset/base/228959
Log:
Don't fallback to a CARP address in BACKUP state.
Modified:
head/sys/netinet/if_ether.c
Modified: head/sys/netinet/if_ether.c
==
--- head/sys/netinet/if_ether.c Thu Dec 29 15:35:47 2011(r228958)
+++ head/sys/netinet/if_ether.c Thu Dec 29 15:59:14 2011(r228959)
@@ -610,7 +610,9 @@ in_arpinput(struct mbuf *m)
*/
IF_ADDR_LOCK(ifp);
TAILQ_FOREACH(ifa, ifp-if_addrhead, ifa_link)
- if (ifa-ifa_addr-sa_family == AF_INET) {
+ if (ifa-ifa_addr-sa_family == AF_INET
+ (ifa-ifa_carp == NULL ||
+ (*carp_iamatch_p)(ifa, enaddr))) {
ia = ifatoia(ifa);
ifa_ref(ifa);
IF_ADDR_UNLOCK(ifp);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228955 - head/include
On Thu, Dec 29, 2011 at 08:23:59PM +0100, Ed Schouten wrote: Hi Steve, * Steve Kargl s...@troutmask.apl.washington.edu, 20111229 19:49: Are you going to submit a bug report to GCC? Because, as of now, you've broken my ability to do development work on bleeding edge freebsd and bleeding edge gcc. Here you go: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51705 Thanks. In the future, could you write such bug reports yourself? I am really not that interested in GCC's development process. I'll try, but I don't know C11 or C++11. While you may have no interest in GCC developement, the ports collection uses GCC. I can also see this type of problem leading to 3rd part software developer dropping support for FreeBSD because they need to work around issues with FreeBSD headers. -- Steve ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228966 - in head/sys: netinet netinet6
Author: jhb
Date: Thu Dec 29 18:25:18 2011
New Revision: 228966
URL: http://svn.freebsd.org/changeset/base/228966
Log:
Use queue(3) macros instead of home-rolled versions in several places in
the INET6 code. This includes retiring the 'ndpr_next' and 'pfr_next'
macros.
Submitted by: pluknet (earlier version)
Reviewed by: pluknet
Modified:
head/sys/netinet/sctp_output.c
head/sys/netinet6/icmp6.c
head/sys/netinet6/in6.c
head/sys/netinet6/in6_ifattach.c
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_rtr.c
Modified: head/sys/netinet/sctp_output.c
==
--- head/sys/netinet/sctp_output.c Thu Dec 29 18:18:42 2011
(r228965)
+++ head/sys/netinet/sctp_output.c Thu Dec 29 18:25:18 2011
(r228966)
@@ -13797,8 +13797,7 @@ sctp_v6src_match_nexthop(struct sockaddr
SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, (struct sockaddr *)src6);
/* search installed gateway from prefix entry */
- for (pfxrtr = pfx-ndpr_advrtrs.lh_first; pfxrtr; pfxrtr =
- pfxrtr-pfr_next) {
+ LIST_FOREACH(pfxrtr, pfx-ndpr_advrtrs, pfr_entry) {
memset(gw6, 0, sizeof(struct sockaddr_in6));
gw6.sin6_family = AF_INET6;
gw6.sin6_len = sizeof(struct sockaddr_in6);
Modified: head/sys/netinet6/icmp6.c
==
--- head/sys/netinet6/icmp6.c Thu Dec 29 18:18:42 2011(r228965)
+++ head/sys/netinet6/icmp6.c Thu Dec 29 18:25:18 2011(r228966)
@@ -1780,7 +1780,7 @@ ni6_addrs(struct icmp6_nodeinfo *ni6, st
}
IFNET_RLOCK_NOSLEEP();
- for (ifp = TAILQ_FIRST(V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
+ TAILQ_FOREACH(ifp, V_ifnet, if_list) {
addrsofif = 0;
IF_ADDR_LOCK(ifp);
TAILQ_FOREACH(ifa, ifp-if_addrhead, ifa_link) {
Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Thu Dec 29 18:18:42 2011(r228965)
+++ head/sys/netinet6/in6.c Thu Dec 29 18:25:18 2011(r228966)
@@ -1369,7 +1369,7 @@ in6_purgeaddr(struct ifaddr *ifa)
/*
* leave from multicast groups we have joined for the interface
*/
- while ((imm = ia-ia6_memberships.lh_first) != NULL) {
+ while ((imm = LIST_FIRST(ia-ia6_memberships)) != NULL) {
LIST_REMOVE(imm, i6mm_chain);
in6_leavegroup(imm);
}
@@ -2353,8 +2353,7 @@ in6_setmaxmtu(void)
struct ifnet *ifp;
IFNET_RLOCK_NOSLEEP();
- for (ifp = TAILQ_FIRST(V_ifnet); ifp;
- ifp = TAILQ_NEXT(ifp, if_list)) {
+ TAILQ_FOREACH(ifp, V_ifnet, if_list) {
/* this function can be called during ifnet initialization */
if (!ifp-if_afdata[AF_INET6])
continue;
Modified: head/sys/netinet6/in6_ifattach.c
==
--- head/sys/netinet6/in6_ifattach.cThu Dec 29 18:18:42 2011
(r228965)
+++ head/sys/netinet6/in6_ifattach.cThu Dec 29 18:25:18 2011
(r228966)
@@ -405,7 +405,7 @@ get_ifid(struct ifnet *ifp0, struct ifne
/* next, try to get it from some other hardware interface */
IFNET_RLOCK_NOSLEEP();
- for (ifp = V_ifnet.tqh_first; ifp; ifp = ifp-if_list.tqe_next) {
+ TAILQ_FOREACH(ifp, V_ifnet, if_list) {
if (ifp == ifp0)
continue;
if (in6_get_hw_ifid(ifp, in6) != 0)
@@ -820,7 +820,7 @@ in6_ifdetach(struct ifnet *ifp)
/*
* leave from multicast groups we have joined for the interface
*/
- while ((imm = ia-ia6_memberships.lh_first) != NULL) {
+ while ((imm = LIST_FIRST(ia-ia6_memberships)) != NULL) {
LIST_REMOVE(imm, i6mm_chain);
in6_leavegroup(imm);
}
@@ -923,8 +923,7 @@ in6_tmpaddrtimer(void *arg)
V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, curvnet);
bzero(nullbuf, sizeof(nullbuf));
- for (ifp = TAILQ_FIRST(V_ifnet); ifp;
- ifp = TAILQ_NEXT(ifp, if_list)) {
+ TAILQ_FOREACH(ifp, V_ifnet, if_list) {
ndi = ND_IFINFO(ifp);
if (bcmp(ndi-randomid, nullbuf, sizeof(nullbuf)) != 0) {
/*
Modified: head/sys/netinet6/nd6.c
==
--- head/sys/netinet6/nd6.c Thu Dec 29 18:18:42 2011(r228965)
+++ head/sys/netinet6/nd6.c Thu Dec 29 18:25:18 2011(r228966)
@@ -572,8 +572,8 @@ nd6_timer(void *arg)
{
CURVNET_SET((struct vnet *) arg);
int s;
- struct nd_defrouter *dr;
- struct
svn commit: r228969 - head/sys/netinet
Author: jhb
Date: Thu Dec 29 20:41:16 2011
New Revision: 228969
URL: http://svn.freebsd.org/changeset/base/228969
Log:
Defer the work of freeing IPv4 multicast options from a socket to an
asychronous task. This avoids tearing down multicast state including
sending IGMP leave messages and reprogramming MAC filters while holding
the per-protocol global pcbinfo lock that is used in the receive path of
packet processing.
Reviewed by: rwatson
MFC after:1 month
Modified:
head/sys/netinet/in_mcast.c
head/sys/netinet/ip_var.h
Modified: head/sys/netinet/in_mcast.c
==
--- head/sys/netinet/in_mcast.c Thu Dec 29 19:01:29 2011(r228968)
+++ head/sys/netinet/in_mcast.c Thu Dec 29 20:41:16 2011(r228969)
@@ -46,6 +46,7 @@ __FBSDID($FreeBSD$);
#include sys/protosw.h
#include sys/sysctl.h
#include sys/ktr.h
+#include sys/taskqueue.h
#include sys/tree.h
#include net/if.h
@@ -144,6 +145,8 @@ static void inm_purge(struct in_multi *)
static voidinm_reap(struct in_multi *);
static struct ip_moptions *
inp_findmoptions(struct inpcb *);
+static voidinp_freemoptions_internal(struct ip_moptions *);
+static voidinp_gcmoptions(void *, int);
static int inp_get_source_filters(struct inpcb *, struct sockopt *);
static int inp_join_group(struct inpcb *, struct sockopt *);
static int inp_leave_group(struct inpcb *, struct sockopt *);
@@ -179,6 +182,10 @@ static SYSCTL_NODE(_net_inet_ip_mcast, O
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip_mcast_filters,
Per-interface stack-wide source filters);
+static STAILQ_HEAD(, ip_moptions) imo_gc_list =
+STAILQ_HEAD_INITIALIZER(imo_gc_list);
+static struct task imo_gc_task = TASK_INITIALIZER(0, inp_gcmoptions, NULL);
+
/*
* Inline function which wraps assertions for a valid ifp.
* The ifnet layer will set the ifma's ifp pointer to NULL if the ifp
@@ -1518,17 +1525,29 @@ inp_findmoptions(struct inpcb *inp)
}
/*
- * Discard the IP multicast options (and source filters).
+ * Discard the IP multicast options (and source filters). To minimize
+ * the amount of work done while holding locks such as the INP's
+ * pcbinfo lock (which is used in the receive path), the free
+ * operation is performed asynchronously in a separate task.
*
* SMPng: NOTE: assumes INP write lock is held.
*/
void
inp_freemoptions(struct ip_moptions *imo)
{
- struct in_mfilter *imf;
- size_t idx, nmships;
KASSERT(imo != NULL, (%s: ip_moptions is NULL, __func__));
+ IN_MULTI_LOCK();
+ STAILQ_INSERT_TAIL(imo_gc_list, imo, imo_link);
+ IN_MULTI_UNLOCK();
+ taskqueue_enqueue(taskqueue_thread, imo_gc_task);
+}
+
+static void
+inp_freemoptions_internal(struct ip_moptions *imo)
+{
+ struct in_mfilter *imf;
+ size_t idx, nmships;
nmships = imo-imo_num_memberships;
for (idx = 0; idx nmships; ++idx) {
@@ -1546,6 +1565,22 @@ inp_freemoptions(struct ip_moptions *imo
free(imo, M_IPMOPTS);
}
+static void
+inp_gcmoptions(void *context, int pending)
+{
+ struct ip_moptions *imo;
+
+ IN_MULTI_LOCK();
+ while (!STAILQ_EMPTY(imo_gc_list)) {
+ imo = STAILQ_FIRST(imo_gc_list);
+ STAILQ_REMOVE_HEAD(imo_gc_list, imo_link);
+ IN_MULTI_UNLOCK();
+ inp_freemoptions_internal(imo);
+ IN_MULTI_LOCK();
+ }
+ IN_MULTI_UNLOCK();
+}
+
/*
* Atomically get source filters on a socket for an IPv4 multicast group.
* Called with INP lock held; returns with lock released.
Modified: head/sys/netinet/ip_var.h
==
--- head/sys/netinet/ip_var.h Thu Dec 29 19:01:29 2011(r228968)
+++ head/sys/netinet/ip_var.h Thu Dec 29 20:41:16 2011(r228969)
@@ -93,6 +93,7 @@ struct ip_moptions {
u_short imo_max_memberships;/* max memberships this socket */
struct in_multi **imo_membership; /* group memberships */
struct in_mfilter *imo_mfilters; /* source filters */
+ STAILQ_ENTRY(ip_moptions) imo_link;
};
struct ipstat {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228970 - head/lib/libc/sys
Author: pluknet Date: Thu Dec 29 21:12:22 2011 New Revision: 228970 URL: http://svn.freebsd.org/changeset/base/228970 Log: Fix manual section for acl_get(3) and mac_get(3) family functions. Reviewed by: rwatson MFC after:1 week Modified: head/lib/libc/sys/cap_new.2 Modified: head/lib/libc/sys/cap_new.2 == --- head/lib/libc/sys/cap_new.2 Thu Dec 29 20:41:16 2011(r228969) +++ head/lib/libc/sys/cap_new.2 Thu Dec 29 21:12:22 2011(r228970) @@ -107,17 +107,17 @@ Permit checking of an ACL on a file desc for this system call. .It Dv CAP_ACL_DELETE Permit -.Xr acl_delete_fd_np 2 . +.Xr acl_delete_fd_np 3 . .It Dv CAP_ACL_GET Permit -.Xr acl_get_fd 2 +.Xr acl_get_fd 3 and -.Xr acl_get_fd_np 2 . +.Xr acl_get_fd_np 3 . .It Dv CAP_ACL_SET Permit -.Xr acl_set_fd 2 +.Xr acl_set_fd 3 and -.Xr acl_set_fd_np 2 . +.Xr acl_set_fd_np 3 . .It Dv CAP_BIND Permit .Xr bind 2 . @@ -240,10 +240,10 @@ a global name space; see for details. .It Dv CAP_MAC_GET Permit -.Xr mac_get_fd 2 . +.Xr mac_get_fd 3 . .It Dv CAP_MAC_SET Permit -.Xr mac_set_fd 2 . +.Xr mac_set_fd 3 . .It Dv CAP_MMAP Permit .Xr mmap 2 ; @@ -385,12 +385,8 @@ argument is not a capability. .El .Sh SEE ALSO .Xr accept 2 , -.Xr acl_delete_fd_np 2 , -.Xr acl_get_fd 2 , -.Xr acl_get_fd_np 2 , -.Xr acl_set_fd_np 2 , -.Xr aio_read 2 , .Xr aio_fsync 2 , +.Xr aio_read 2 , .Xr aio_write 2 , .Xr bind 2 , .Xr cap_enter 2 , @@ -421,8 +417,6 @@ argument is not a capability. .Xr kqueue 2 , .Xr linkat 2 , .Xr listen 2 , -.Xr mac_get_fd 2 , -.Xr mac_set_fd 2 , .Xr mmap 2 , .Xr mq_open 2 , .Xr open 2 , @@ -450,8 +444,14 @@ argument is not a capability. .Xr socketpair 2 , .Xr unlinkat 2 , .Xr write 2 , +.Xr acl_delete_fd_np 3 , +.Xr acl_get_fd 3 , +.Xr acl_get_fd_np 3 , +.Xr acl_set_fd_np 3 , .Xr cap_limitfd 3 , .Xr libcapsicum 3 , +.Xr mac_get_fd 3 , +.Xr mac_set_fd 3 , .Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem_trywait 3 , ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228966 - in head/sys: netinet netinet6
On 29 December 2011 22:25, John Baldwin j...@freebsd.org wrote: Author: jhb Date: Thu Dec 29 18:25:18 2011 New Revision: 228966 URL: http://svn.freebsd.org/changeset/base/228966 Log: Use queue(3) macros instead of home-rolled versions in several places in the INET6 code. This includes retiring the 'ndpr_next' and 'pfr_next' macros. Submitted by: pluknet (earlier version) Reviewed by: pluknet Thanks! -- wbr, pluknet ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228971 - in head/sys: conf modules/ce
Author: dim
Date: Thu Dec 29 21:17:35 2011
New Revision: 228971
URL: http://svn.freebsd.org/changeset/base/228971
Log:
For sys/dev/ce/tau32-ddk.c, disable the following warning when building
with clang:
sys/dev/ce/tau32-ddk.c:1228:37: warning: implicit truncation from 'int' to
bitfield changes value from 65532 to 8188 [-Wconstant-conversion]
Since this file is obfuscated C, we can never determine (in a sane way,
at least :) if this points to a real problem or not. The driver has
been in the tree for more than five years, so it most likely isn't.
MFC after:1 week
Modified:
head/sys/conf/files.i386
head/sys/modules/ce/Makefile
Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Thu Dec 29 21:12:22 2011(r228970)
+++ head/sys/conf/files.i386Thu Dec 29 21:17:35 2011(r228971)
@@ -148,7 +148,8 @@ dev/atkbdc/atkbdc_subr.coptional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
dev/ce/ceddk.c optional ce
dev/ce/if_ce.c optional ce
-dev/ce/tau32-ddk.c optional ce
+dev/ce/tau32-ddk.c optional ce \
+ compile-with ${NORMAL_C} ${NO_WCONSTANT_CONVERSION}
dev/cm/if_cm_isa.c optional cm isa
dev/coretemp/coretemp.coptional coretemp
dev/cp/cpddk.c optional cp
Modified: head/sys/modules/ce/Makefile
==
--- head/sys/modules/ce/MakefileThu Dec 29 21:12:22 2011
(r228970)
+++ head/sys/modules/ce/MakefileThu Dec 29 21:17:35 2011
(r228971)
@@ -26,3 +26,6 @@ opt_ng_cronyx.h:
.endif
.include bsd.kmod.mk
+
+CWARNFLAGS.tau32-ddk.c=${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228972 - head/lib/libc/gen
Author: jilles
Date: Thu Dec 29 22:15:18 2011
New Revision: 228972
URL: http://svn.freebsd.org/changeset/base/228972
Log:
libc: Eliminate some relative relocations in file flags table.
Modified:
head/lib/libc/gen/strtofflags.c
Modified: head/lib/libc/gen/strtofflags.c
==
--- head/lib/libc/gen/strtofflags.c Thu Dec 29 21:17:35 2011
(r228971)
+++ head/lib/libc/gen/strtofflags.c Thu Dec 29 22:15:18 2011
(r228972)
@@ -41,35 +41,35 @@ __FBSDID($FreeBSD$);
#include string.h
#include unistd.h
+#define longestflaglen 12
static struct {
- char *name;
+ char name[longestflaglen + 1];
+ char invert;
u_long flag;
- int invert;
-} mapping[] = {
+} const mapping[] = {
/* shorter names per flag first, all prefixed by no */
- { nosappnd, SF_APPEND, 0 },
- { nosappend, SF_APPEND, 0 },
- { noarch, SF_ARCHIVED,0 },
- { noarchived, SF_ARCHIVED,0 },
- { noschg, SF_IMMUTABLE, 0 },
- { noschange, SF_IMMUTABLE, 0 },
- { nosimmutable, SF_IMMUTABLE, 0 },
- { nosunlnk, SF_NOUNLINK,0 },
- { nosunlink, SF_NOUNLINK,0 },
+ { nosappnd, 0, SF_APPEND},
+ { nosappend, 0, SF_APPEND},
+ { noarch, 0, SF_ARCHIVED },
+ { noarchived, 0, SF_ARCHIVED },
+ { noschg, 0, SF_IMMUTABLE },
+ { noschange, 0, SF_IMMUTABLE },
+ { nosimmutable, 0, SF_IMMUTABLE },
+ { nosunlnk, 0, SF_NOUNLINK },
+ { nosunlink, 0, SF_NOUNLINK },
#ifdef SF_SNAPSHOT
- { nosnapshot, SF_SNAPSHOT,0 },
+ { nosnapshot, 0, SF_SNAPSHOT },
#endif
- { nouappnd, UF_APPEND, 0 },
- { nouappend, UF_APPEND, 0 },
- { nouchg, UF_IMMUTABLE, 0 },
- { nouchange, UF_IMMUTABLE, 0 },
- { nouimmutable, UF_IMMUTABLE, 0 },
- { nodump, UF_NODUMP, 1 },
- { noopaque, UF_OPAQUE, 0 },
- { nouunlnk, UF_NOUNLINK,0 },
- { nouunlink, UF_NOUNLINK,0 }
+ { nouappnd, 0, UF_APPEND},
+ { nouappend, 0, UF_APPEND},
+ { nouchg, 0, UF_IMMUTABLE },
+ { nouchange, 0, UF_IMMUTABLE },
+ { nouimmutable, 0, UF_IMMUTABLE },
+ { nodump, 1, UF_NODUMP},
+ { noopaque, 0, UF_OPAQUE},
+ { nouunlnk, 0, UF_NOUNLINK },
+ { nouunlink, 0, UF_NOUNLINK }
};
-#define longestflaglen 12
#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228973 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf
Author: rwatson Date: Thu Dec 29 22:48:36 2011 New Revision: 228973 URL: http://svn.freebsd.org/changeset/base/228973 Log: Add options CAPABILITY_MODE and options CAPABILITIES to GENERIC kernel configurations for various architectures in FreeBSD 10.x. This allows basic Capsicum functionality to be used in the default FreeBSD configuration on non-embedded architectures; process descriptors are not yet enabled by default. MFC after:3 months Sponsored by: Google, Inc Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC head/sys/ia64/conf/GENERIC head/sys/pc98/conf/GENERIC head/sys/powerpc/conf/GENERIC head/sys/sparc64/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Thu Dec 29 22:15:18 2011(r228972) +++ head/sys/amd64/conf/GENERIC Thu Dec 29 22:48:36 2011(r228973) @@ -60,6 +60,8 @@ options PRINTF_BUFR_SIZE=128# Prevent optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing +optionsCAPABILITY_MODE # Capsicum capability mode +optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Thu Dec 29 22:15:18 2011(r228972) +++ head/sys/i386/conf/GENERIC Thu Dec 29 22:48:36 2011(r228973) @@ -61,6 +61,8 @@ options PRINTF_BUFR_SIZE=128# Prevent optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing +optionsCAPABILITY_MODE # Capsicum capability mode +optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework #options KDTRACE_HOOKS # Kernel DTrace hooks optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/ia64/conf/GENERIC == --- head/sys/ia64/conf/GENERIC Thu Dec 29 22:15:18 2011(r228972) +++ head/sys/ia64/conf/GENERIC Thu Dec 29 22:48:36 2011(r228973) @@ -26,6 +26,8 @@ ident GENERIC makeoptionsDEBUG=-g# Build kernel with debug information. optionsAUDIT # Security event auditing +optionsCAPABILITY_MODE # Capsicum capability mode +optionsCAPABILITIES# Capsicum capabilities optionsCD9660 # ISO 9660 Filesystem optionsCOMPAT_FREEBSD7 # Compatible with FreeBSD7 optionsFFS # Berkeley Fast Filesystem Modified: head/sys/pc98/conf/GENERIC == --- head/sys/pc98/conf/GENERIC Thu Dec 29 22:15:18 2011(r228972) +++ head/sys/pc98/conf/GENERIC Thu Dec 29 22:48:36 2011(r228973) @@ -63,6 +63,8 @@ options _KPOSIX_PRIORITY_SCHEDULING # P optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing +optionsCAPABILITY_MODE # Capsicum capability mode +optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/powerpc/conf/GENERIC == --- head/sys/powerpc/conf/GENERIC Thu Dec 29 22:15:18 2011 (r228972) +++ head/sys/powerpc/conf/GENERIC Thu Dec 29 22:48:36 2011 (r228973) @@ -64,6 +64,8 @@ options SYSVSEM #SYSV-style semaphore options_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions optionsHWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) optionsAUDIT # Security event auditing +optionsCAPABILITY_MODE # Capsicum capability mode +optionsCAPABILITIES# Capsicum capabilities optionsMAC # TrustedBSD MAC Framework optionsINCLUDE_CONFIG_FILE # Include this file in kernel Modified: head/sys/sparc64/conf/GENERIC == ---
svn commit: r228974 - head/tools/test/testfloat
Author: uqs Date: Fri Dec 30 00:02:56 2011 New Revision: 228974 URL: http://svn.freebsd.org/changeset/base/228974 Log: Set fbsd:nokeywords for contributed sources. Modified: Directory Properties: head/tools/test/testfloat/systemBugs.txt (props changed) head/tools/test/testfloat/testfloat-history.txt (props changed) head/tools/test/testfloat/testfloat-source.txt (props changed) head/tools/test/testfloat/testfloat.txt (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228975 - in head/tools: KSE/ksetest debugscripts regression regression/bin/sh/builtins regression/fifo/fifo_io regression/file/dup regression/kthread/kld regression/lib/libc/nss regres...
Author: uqs
Date: Fri Dec 30 00:04:11 2011
New Revision: 228975
URL: http://svn.freebsd.org/changeset/base/228975
Log:
Spelling fixes for tools/
Add some $FreeBSD$ tags so svn will allow the commit.
Modified:
head/tools/KSE/ksetest/kse_threads_test.c
head/tools/debugscripts/gdbinit.i386
head/tools/debugscripts/kld_deb.py
head/tools/regression/README
head/tools/regression/bin/sh/builtins/cd1.0
head/tools/regression/fifo/fifo_io/fifo_io.c
head/tools/regression/file/dup/dup.c
head/tools/regression/kthread/kld/kthrdlk.c
head/tools/regression/lib/libc/nss/README
head/tools/regression/nfsmmap/Makefile
head/tools/regression/nfsmmap/README
head/tools/regression/pjdfstest/tests/chown/00.t
head/tools/regression/priv/priv_cred.c
head/tools/regression/security/open_to_operation/open_to_operation.c
head/tools/regression/usr.bin/env/regress-sb.rb
head/tools/regression/usr.bin/make/README
head/tools/regression/usr.bin/make/variables/modifier_M/Makefile
head/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
head/tools/regression/usr.bin/sed/math.sed
head/tools/regression/usr.sbin/newsyslog/regress.sh
head/tools/test/posixshm/shm_test.c
head/tools/test/testfloat/systemBugs.txt
head/tools/test/testfloat/testfloat-source.txt
head/tools/test/testfloat/testfloat.txt
head/tools/tools/bus_autoconf/bus_autoconf.c
head/tools/tools/cd2dvd/cd2dvd.sh
head/tools/tools/net80211/wlaninject/README
head/tools/tools/netmap/bridge.c
head/tools/tools/netmap/pkt-gen.c
head/tools/tools/sysbuild/README
head/tools/tools/tinybsd/README
Modified: head/tools/KSE/ksetest/kse_threads_test.c
==
--- head/tools/KSE/ksetest/kse_threads_test.c Fri Dec 30 00:02:56 2011
(r228974)
+++ head/tools/KSE/ksetest/kse_threads_test.c Fri Dec 30 00:04:11 2011
(r228975)
@@ -418,7 +418,7 @@ uts(struct kse_mailbox *km)
simplelock_lock(data-runq-lock);
/*
-* Process any signals we've recieved (but only if we have
+* Process any signals we've received (but only if we have
* somewhere to deliver them to).
*/
if ((data-runq-head != NULL) SIGNOTEMPTY(km-km_sigscaught)) {
Modified: head/tools/debugscripts/gdbinit.i386
==
--- head/tools/debugscripts/gdbinit.i386Fri Dec 30 00:02:56 2011
(r228974)
+++ head/tools/debugscripts/gdbinit.i386Fri Dec 30 00:04:11 2011
(r228975)
@@ -268,7 +268,7 @@ while (*(int *) $frame 0xc000)
end
end
document btr
-Show a backtrace from the ebp address specified. This can be used to get a
backtrace from any stack resident in memory. It's the user's responsiblity to
ensure that the address is meaningful.
+Show a backtrace from the ebp address specified. This can be used to get a
backtrace from any stack resident in memory. It's the user's responsibility to
ensure that the address is meaningful.
end
# btp pid
Modified: head/tools/debugscripts/kld_deb.py
==
--- head/tools/debugscripts/kld_deb.py Fri Dec 30 00:02:56 2011
(r228974)
+++ head/tools/debugscripts/kld_deb.py Fri Dec 30 00:04:11 2011
(r228975)
@@ -68,9 +68,9 @@ gdb = popen2.popen4(gdb_cmd)
def searchfor(inp, re, j = 0, l = None):
searchfor(inp, re, j, l): Searches for regex re in inp. It will
-automaticly add more lines. If j is set, the lines will be joined together.
+automatically add more lines. If j is set, the lines will be joined together.
l can provide a starting line to help search against. Return value is a
-tupple of the last line, and the match if any.
+tuple of the last line, and the match if any.
ret = None
if not l:
l = inp.readline()
@@ -87,7 +87,7 @@ tupple of the last line, and the match i
def get_addresses(inp, out):
get_addresses(inp, out): It will search for addresses from gdb.
inp and out, are the gdb input and output respectively. Return value is
-a list of tupples. The tupples contain the filename and the address the
+a list of tuples. The tuples contain the filename and the address the
filename was loaded.
addr = []
nxad = 1
Modified: head/tools/regression/README
==
--- head/tools/regression/READMEFri Dec 30 00:02:56 2011
(r228974)
+++ head/tools/regression/READMEFri Dec 30 00:04:11 2011
(r228975)
@@ -37,7 +37,7 @@ test name. For example,
A test may be flagged as 'todo'. This indicates that you expect the test
to fail (perhaps because the necessary functionality hasn't been written
yet). 'todo' tests are expected to fail, so when they start working the
-test framework can alert you to this happy occurence. Flag
svn commit: r228976 - in head/usr.sbin: acpi/acpiconf bluetooth/hccontrol burncd chkgrp kbdcontrol kldxref pkg_install/updating vidcontrol
Author: uqs
Date: Fri Dec 30 00:59:08 2011
New Revision: 228976
URL: http://svn.freebsd.org/changeset/base/228976
Log:
Reencode files to UTF-8. Drop CP1252 em-dash.
Modified:
head/usr.sbin/acpi/acpiconf/acpiconf.8
head/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
head/usr.sbin/burncd/burncd.8
head/usr.sbin/burncd/burncd.c
head/usr.sbin/chkgrp/chkgrp.8
head/usr.sbin/chkgrp/chkgrp.c
head/usr.sbin/kbdcontrol/kbdcontrol.c
head/usr.sbin/kbdcontrol/lex.h
head/usr.sbin/kbdcontrol/lex.l
head/usr.sbin/kldxref/kldxref.8
head/usr.sbin/pkg_install/updating/main.c
head/usr.sbin/pkg_install/updating/pathnames.h
head/usr.sbin/pkg_install/updating/pkg_updating.1
head/usr.sbin/vidcontrol/decode.c
head/usr.sbin/vidcontrol/vidcontrol.c
Modified: head/usr.sbin/acpi/acpiconf/acpiconf.8
==
--- head/usr.sbin/acpi/acpiconf/acpiconf.8 Fri Dec 30 00:04:11 2011
(r228975)
+++ head/usr.sbin/acpi/acpiconf/acpiconf.8 Fri Dec 30 00:59:08 2011
(r228976)
@@ -1,5 +1,5 @@
.\-
-.\ Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav
+.\ Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
.\ All rights reserved.
.\
.\ Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
==
--- head/usr.sbin/bluetooth/hccontrol/host_controller_baseband.cFri Dec
30 00:04:11 2011(r228975)
+++ head/usr.sbin/bluetooth/hccontrol/host_controller_baseband.cFri Dec
30 00:59:08 2011(r228976)
@@ -1632,8 +1632,8 @@ struct hci_commandhost_controller_baseb
begins the next page scan. The Page_Scan_Window configuration parameter\n \
defines the amount of time for the duration of the page scan. \n \
The Page_Scan_Window can only be less than or equal to the
Page_Scan_Interval.\n\n \
-\tinterval - Range: 0x0012 -� 0x100, Time = N * 0.625 msec\n \
-\twindow - Range: 0x0012 -� 0x100, Time = N * 0.625 msen,
+\tinterval - Range: 0x0012 -- 0x100, Time = N * 0.625 msec\n \
+\twindow - Range: 0x0012 -- 0x100, Time = N * 0.625 msen,
hci_write_page_scan_activity
},
{
@@ -1654,8 +1654,8 @@ struct hci_commandhost_controller_baseb
until it begins the next inquiry scan. The Inquiry_Scan_Window
configuration\n \
parameter defines the amount of time for the duration of the inquiry scan.\n
\
The Inquiry_Scan_Window can only be less than or equal to the
Inquiry_Scan_Interval.\n\n \
-\tinterval - Range: 0x0012 -� 0x100, Time = N * 0.625 msec\n \
-\twindow - Range: 0x0012 -� 0x100, Time = N * 0.625 msen,
+\tinterval - Range: 0x0012 -- 0x100, Time = N * 0.625 msec\n \
+\twindow - Range: 0x0012 -- 0x100, Time = N * 0.625 msen,
hci_write_inquiry_scan_activity
},
{
Modified: head/usr.sbin/burncd/burncd.8
==
--- head/usr.sbin/burncd/burncd.8 Fri Dec 30 00:04:11 2011
(r228975)
+++ head/usr.sbin/burncd/burncd.8 Fri Dec 30 00:59:08 2011
(r228976)
@@ -1,5 +1,5 @@
.\
-.\ Copyright (c) 2000,2001,2002 S�ren Schmidt s...@freebsd.org
+.\ Copyright (c) 2000,2001,2002 Søren Schmidt s...@freebsd.org
.\ All rights reserved.
.\
.\ Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/burncd/burncd.c
==
--- head/usr.sbin/burncd/burncd.c Fri Dec 30 00:04:11 2011
(r228975)
+++ head/usr.sbin/burncd/burncd.c Fri Dec 30 00:59:08 2011
(r228976)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2000,2001,2002 S�ren Schmidt s...@freebsd.org
+ * Copyright (c) 2000,2001,2002 Søren Schmidt s...@freebsd.org
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/chkgrp/chkgrp.8
==
--- head/usr.sbin/chkgrp/chkgrp.8 Fri Dec 30 00:04:11 2011
(r228975)
+++ head/usr.sbin/chkgrp/chkgrp.8 Fri Dec 30 00:59:08 2011
(r228976)
@@ -1,4 +1,4 @@
-.\ Copyright (c) 1998 Dag-Erling Co�dan Sm�rgrav
+.\ Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
.\ All rights reserved.
.\
.\ Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/chkgrp/chkgrp.c
==
--- head/usr.sbin/chkgrp/chkgrp.c Fri Dec 30 00:04:11 2011
(r228975)
+++ head/usr.sbin/chkgrp/chkgrp.c Fri Dec 30 00:59:08 2011
(r228976)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998 Dag-Erling Co�dan Sm�rgrav
+ * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified:
svn commit: r228978 - in head/sys: conf modules/drm/r128 modules/drm/radeon modules/drm/via
Author: dim
Date: Fri Dec 30 01:54:45 2011
New Revision: 228978
URL: http://svn.freebsd.org/changeset/base/228978
Log:
For several files in sys/dev/drm, disable -Wunused-value when building
with clang. There are several macros in these files that return values,
and in some cases nothing is done with them, but it is completely
harmless. For some other files, also disable -Wconstant-conversion,
since that triggers a false positive with the DMA_BIT_MASK() macro.
MFC after:1 week
Modified:
head/sys/conf/files
head/sys/conf/kern.mk
head/sys/modules/drm/r128/Makefile
head/sys/modules/drm/radeon/Makefile
head/sys/modules/drm/via/Makefile
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri Dec 30 01:37:25 2011(r228977)
+++ head/sys/conf/files Fri Dec 30 01:54:45 2011(r228978)
@@ -992,15 +992,18 @@ dev/drm/mga_irq.c optional mgadrm
dev/drm/mga_state.coptional mgadrm \
compile-with ${NORMAL_C} -finline-limit=13500
dev/drm/mga_warp.c optional mgadrm
-dev/drm/r128_cce.c optional r128drm
+dev/drm/r128_cce.c optional r128drm \
+ compile-with ${NORMAL_C} ${NO_WUNUSED_VALUE}
${NO_WCONSTANT_CONVERSION}
dev/drm/r128_drv.c optional r128drm
dev/drm/r128_irq.c optional r128drm
dev/drm/r128_state.c optional r128drm \
- compile-with ${NORMAL_C} -finline-limit=13500
+ compile-with ${NORMAL_C} ${NO_WUNUSED_VALUE} -finline-limit=13500
dev/drm/r300_cmdbuf.c optional radeondrm
dev/drm/r600_blit.coptional radeondrm
-dev/drm/r600_cp.c optional radeondrm
-dev/drm/radeon_cp.coptional radeondrm
+dev/drm/r600_cp.c optional radeondrm \
+ compile-with ${NORMAL_C} ${NO_WUNUSED_VALUE}
${NO_WCONSTANT_CONVERSION}
+dev/drm/radeon_cp.coptional radeondrm \
+ compile-with ${NORMAL_C} ${NO_WUNUSED_VALUE}
${NO_WCONSTANT_CONVERSION}
dev/drm/radeon_cs.coptional radeondrm
dev/drm/radeon_drv.c optional radeondrm
dev/drm/radeon_irq.c optional radeondrm
Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk Fri Dec 30 01:37:25 2011(r228977)
+++ head/sys/conf/kern.mk Fri Dec 30 01:54:45 2011(r228978)
@@ -20,6 +20,7 @@ NO_WCONSTANT_CONVERSION= -Wno-constant-c
NO_WARRAY_BOUNDS= -Wno-array-bounds
NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-count-negative
NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-count-overflow
+NO_WUNUSED_VALUE= -Wno-unused-value
# Several other warnings which might be useful in some cases, but not severe
# enough to error out the whole kernel build. Display them anyway, so there is
# some incentive to fix them eventually.
Modified: head/sys/modules/drm/r128/Makefile
==
--- head/sys/modules/drm/r128/Makefile Fri Dec 30 01:37:25 2011
(r228977)
+++ head/sys/modules/drm/r128/Makefile Fri Dec 30 01:54:45 2011
(r228978)
@@ -6,3 +6,7 @@ SRCS= r128_cce.c r128_drv.c r128_irq.c
SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include bsd.kmod.mk
+
+CWARNFLAGS.r128_cce.c= ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.r128_state.c= ${NO_WUNUSED_VALUE}
+CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm/radeon/Makefile
==
--- head/sys/modules/drm/radeon/MakefileFri Dec 30 01:37:25 2011
(r228977)
+++ head/sys/modules/drm/radeon/MakefileFri Dec 30 01:54:45 2011
(r228978)
@@ -7,3 +7,7 @@ SRCS= r300_cmdbuf.c r600_blit.c r600_cp
SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include bsd.kmod.mk
+
+CWARNFLAGS.r600_cp.c= ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.radeon_cp.c=${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
Modified: head/sys/modules/drm/via/Makefile
==
--- head/sys/modules/drm/via/Makefile Fri Dec 30 01:37:25 2011
(r228977)
+++ head/sys/modules/drm/via/Makefile Fri Dec 30 01:54:45 2011
(r228978)
@@ -20,3 +20,7 @@ opt_drm.h:
echo $(DRM_LINUX_OPT) opt_drm.h
.include bsd.kmod.mk
+
+CWARNFLAGS.via_dma.c= ${NO_WUNUSED_VALUE}
+CWARNFLAGS.via_dmablit.c= ${NO_WUNUSED_VALUE}
+CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228878 - head/include
On Sun, 25 Dec 2011, Ed Schouten wrote: Author: ed Date: Sun Dec 25 20:15:41 2011 New Revision: 228878 URL: http://svn.freebsd.org/changeset/base/228878 Log: Remove unneeded guard. There is no reason why stdbool.h needs an include guard. It is already protected by __bool_true_false_are_defined. Modified: head/include/stdbool.h Modified: head/include/stdbool.h == --- head/include/stdbool.h Sun Dec 25 18:15:31 2011(r228877) +++ head/include/stdbool.h Sun Dec 25 20:15:41 2011(r228878) @@ -26,9 +26,6 @@ * $FreeBSD$ */ -#ifndef _STDBOOL_H_ -#define_STDBOOL_H_ - #ifndef __bool_true_false_are_defined #define __bool_true_false_are_defined 1 @@ -44,5 +41,3 @@ typedef int _Bool; #endif /* !__cplusplus */ #endif /* __bool_true_false_are_defined */ - -#endif /* !_STDBOOL_H_ */ I just thought of this while reviewing the change: should __bool_true_false_are_defined be set only if __cplusplus is not set? It should be set for C99, but I wonder if it should be set for C++. Also, is there a style requirement that the guard for a header file be based off of the name of the file? I did not see anything obvious for this within style(9), but I am curious. Sean -- s...@freebsd.org ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228980 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
Author: dim Date: Fri Dec 30 02:58:37 2011 New Revision: 228980 URL: http://svn.freebsd.org/changeset/base/228980 Log: Reapply r228785 now it has been tested by Adrian. Also add comments with the old AR_SCR_SLE_XXX values, with a short explanation why they were changed. Reviewed by: adrian MFC after:1 week Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h == --- head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Fri Dec 30 02:07:50 2011 (r228979) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Fri Dec 30 02:58:37 2011 (r228980) @@ -245,9 +245,20 @@ #defineAR_SCR_SLDUR0x /* sleep duration */ #defineAR_SCR_SLE 0x0003 /* sleep enable */ #defineAR_SCR_SLE_S16 -#defineAR_SCR_SLE_WAKE 0x /* force wake */ -#defineAR_SCR_SLE_SLP 0x0001 /* force sleep */ -#defineAR_SCR_SLE_ALLOW0x0002 /* allow to control sleep */ +/* + * The previous values for the following three defines were: + * + * AR_SCR_SLE_WAKE 0x + * AR_SCR_SLE_SLP 0x0001 + * AR_SCR_SLE_ALLOW0x0002 + * + * However, these have been pre-shifted with AR_SCR_SLE_S. The + * OS_REG_READ() macro would attempt to shift them again, effectively + * shifting out any of the set bits completely. + */ +#defineAR_SCR_SLE_WAKE 0 /* force wake */ +#defineAR_SCR_SLE_SLP 1 /* force sleep */ +#defineAR_SCR_SLE_ALLOW2 /* allow to control sleep */ #defineAR_SCR_BITS \20\20SLE_SLP\21SLE_ALLOW #defineAR_INTPEND_IP 0x0001 /* interrupt pending */ Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h == --- head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Fri Dec 30 02:07:50 2011 (r228979) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Fri Dec 30 02:58:37 2011 (r228980) @@ -618,9 +618,20 @@ #defineAR_SCR_SLDUR_S 0 #defineAR_SCR_SLE 0x0003 /* sleep enable mask */ #defineAR_SCR_SLE_S16 /* sleep enable bits shift */ -#defineAR_SCR_SLE_WAKE 0x /* force wake */ -#defineAR_SCR_SLE_SLP 0x0001 /* force sleep */ -#defineAR_SCR_SLE_NORM 0x0002 /* sleep logic normal operation */ +/* + * The previous values for the following three defines were: + * + * AR_SCR_SLE_WAKE 0x + * AR_SCR_SLE_SLP 0x0001 + * AR_SCR_SLE_NORM 0x0002 + * + * However, these have been pre-shifted with AR_SCR_SLE_S. The + * OS_REG_READ() macro would attempt to shift them again, effectively + * shifting out any of the set bits completely. + */ +#defineAR_SCR_SLE_WAKE 0 /* force wake */ +#defineAR_SCR_SLE_SLP 1 /* force sleep */ +#defineAR_SCR_SLE_NORM 2 /* sleep logic normal operation */ #defineAR_SCR_SLE_UNITS0x0008 /* SCR units/TU */ #defineAR_SCR_BITS \20\20SLE_SLP\21SLE ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r228878 - head/include
On Thu, Dec 29, 2011 at 6:54 PM, Sean C. Farley s...@freebsd.org wrote: On Sun, 25 Dec 2011, Ed Schouten wrote: Author: ed Date: Sun Dec 25 20:15:41 2011 New Revision: 228878 URL: http://svn.freebsd.org/changeset/base/228878 Log: Remove unneeded guard. There is no reason why stdbool.h needs an include guard. It is already protected by __bool_true_false_are_defined. Modified: head/include/stdbool.h Modified: head/include/stdbool.h == --- head/include/stdbool.h Sun Dec 25 18:15:31 2011 (r228877) +++ head/include/stdbool.h Sun Dec 25 20:15:41 2011 (r228878) @@ -26,9 +26,6 @@ * $FreeBSD$ */ -#ifndef _STDBOOL_H_ -#define _STDBOOL_H_ - #ifndef __bool_true_false_are_defined #define __bool_true_false_are_defined 1 @@ -44,5 +41,3 @@ typedef int _Bool; #endif /* !__cplusplus */ #endif /* __bool_true_false_are_defined */ - -#endif /* !_STDBOOL_H_ */ I just thought of this while reviewing the change: should __bool_true_false_are_defined be set only if __cplusplus is not set? It should be set for C99, but I wonder if it should be set for C++. My quick googling didn't show anything at all about the C++ standard and stdbool.h or __bool_true_false_are_defined. It was probably originally set because bool, true, and false are all C++ keywords so certain code that wanted to ifdef on them didn't also need to check __cplusplus. Also, is there a style requirement that the guard for a header file be based off of the name of the file? I did not see anything obvious for this within style(9), but I am curious. I think it's just common use to make sure different headers use a different include guard, so they only protect their contents, not any other file's. The C standard only mentions the symbols bool, true, false, and __bool_true_false_are_defined in regards to stdbool.h. Cheers, matthew ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228981 - in head/sys/modules: . cfi
Author: marcel
Date: Fri Dec 30 03:48:39 2011
New Revision: 228981
URL: http://svn.freebsd.org/changeset/base/228981
Log:
Add a module for cfi(4). Build only for arm and powerpc, as there are
only bus attachments only for these.
Added:
head/sys/modules/cfi/
head/sys/modules/cfi/Makefile (contents, props changed)
Modified:
head/sys/modules/Makefile
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri Dec 30 02:58:37 2011(r228980)
+++ head/sys/modules/Makefile Fri Dec 30 03:48:39 2011(r228981)
@@ -57,6 +57,7 @@ SUBDIR= ${_3dfx} \
cd9660 \
cd9660_iconv \
${_ce} \
+ ${_cfi} \
${_ciss} \
${_cm} \
${_cmx} \
@@ -654,6 +655,10 @@ _zfs= zfs
.endif
.endif
+.if ${MACHINE_CPUARCH} == arm
+_cfi= cfi
+.endif
+
.if ${MACHINE_CPUARCH} == ia64
_aac= aac
_aic= aic
@@ -697,6 +702,7 @@ _xe=xe
_agp= agp
_an= an
_bm= bm
+_cfi= cfi
_cpufreq= cpufreq
_nvram=powermac_nvram
_smbfs=smbfs
Added: head/sys/modules/cfi/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/modules/cfi/Makefile Fri Dec 30 03:48:39 2011
(r228981)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/cfi
+
+KMOD= cfi
+SRCS= ${_cfi_bus} cfi_core.c cfi_dev.c
+SRCS+= bus_if.h device_if.h opt_cfi.h
+
+.if ${MACHINE} == arm
+_cfi_bus= cfi_bus_fdt.c cfi_bus_ixp4xx.c
+.endif
+.if ${MACHINE} == powerpc
+_cfi_bus= cfi_bus_fdt.c
+.endif
+
+opt_cfi.h:
+ echo #define CFI_SUPPORT_STRATAFLASH 1 ${.TARGET}
+
+.include bsd.kmod.mk
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228982 - head/sys/mips/include
Author: marcel Date: Fri Dec 30 03:54:22 2011 New Revision: 228982 URL: http://svn.freebsd.org/changeset/base/228982 Log: Remove trailing white-space. Modified: head/sys/mips/include/intr_machdep.h Modified: head/sys/mips/include/intr_machdep.h == --- head/sys/mips/include/intr_machdep.hFri Dec 30 03:48:39 2011 (r228981) +++ head/sys/mips/include/intr_machdep.hFri Dec 30 03:54:22 2011 (r228982) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD$ */ #ifndef_MACHINE_INTR_MACHDEP_H_ @@ -32,7 +32,7 @@ #include machine/atomic.h #if defined(CPU_RMI) || defined(CPU_NLM) -#define XLR_MAX_INTR 64 +#define XLR_MAX_INTR 64 #else #define NHARD_IRQS 6 #define NSOFT_IRQS 2 @@ -41,9 +41,9 @@ struct trapframe; void cpu_init_interrupts(void); -void cpu_establish_hardintr(const char *, driver_filter_t *, driver_intr_t *, +void cpu_establish_hardintr(const char *, driver_filter_t *, driver_intr_t *, void *, int, int, void **); -void cpu_establish_softintr(const char *, driver_filter_t *, void (*)(void*), +void cpu_establish_softintr(const char *, driver_filter_t *, void (*)(void*), void *, int, int, void **); void cpu_intr(struct trapframe *); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228983 - head/sys/dev/uart
Author: marcel Date: Fri Dec 30 03:57:17 2011 New Revision: 228983 URL: http://svn.freebsd.org/changeset/base/228983 Log: Actually set the baudrate from the FDT. Modified: head/sys/dev/uart/uart_bus_fdt.c Modified: head/sys/dev/uart/uart_bus_fdt.c == --- head/sys/dev/uart/uart_bus_fdt.cFri Dec 30 03:54:22 2011 (r228982) +++ head/sys/dev/uart/uart_bus_fdt.cFri Dec 30 03:57:17 2011 (r228983) @@ -186,7 +186,7 @@ uart_cpu_getdev(int devtype, struct uart di-bas.chan = 0; di-bas.regshft = (u_int)shift; - di-baudrate = 0; + di-baudrate = br; di-bas.rclk = (u_int)rclk; di-ops = uart_getops(class); di-databits = 8; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228984 - head/sys/dev/fdt
Author: marcel
Date: Fri Dec 30 04:00:31 2011
New Revision: 228984
URL: http://svn.freebsd.org/changeset/base/228984
Log:
DEBUG is a kernel option. Don't define it here, as it breaks LINT.
Since DEBUG was subsequently undefined, this is just debugging left-
over.
Modified:
head/sys/dev/fdt/fdt_pci.c
head/sys/dev/fdt/fdtbus.c
head/sys/dev/fdt/simplebus.c
Modified: head/sys/dev/fdt/fdt_pci.c
==
--- head/sys/dev/fdt/fdt_pci.c Fri Dec 30 03:57:17 2011(r228983)
+++ head/sys/dev/fdt/fdt_pci.c Fri Dec 30 04:00:31 2011(r228984)
@@ -46,9 +46,6 @@ __FBSDID($FreeBSD$);
#include ofw_bus_if.h
#include pcib_if.h
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf(%s(): , __func__); \
printf(fmt,##args); } while (0)
Modified: head/sys/dev/fdt/fdtbus.c
==
--- head/sys/dev/fdt/fdtbus.c Fri Dec 30 03:57:17 2011(r228983)
+++ head/sys/dev/fdt/fdtbus.c Fri Dec 30 04:00:31 2011(r228984)
@@ -46,9 +46,6 @@ __FBSDID($FreeBSD$);
#include fdt_common.h
#include ofw_bus_if.h
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf(%s(): , __func__); \
printf(fmt,##args); } while (0)
Modified: head/sys/dev/fdt/simplebus.c
==
--- head/sys/dev/fdt/simplebus.cFri Dec 30 03:57:17 2011
(r228983)
+++ head/sys/dev/fdt/simplebus.cFri Dec 30 04:00:31 2011
(r228984)
@@ -49,9 +49,6 @@ __FBSDID($FreeBSD$);
#include fdt_common.h
#include ofw_bus_if.h
-#define DEBUG
-#undef DEBUG
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf(%s(): , __func__); \
printf(fmt,##args); } while (0)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r228985 - head/sys/boot/forth
Author: pluknet Date: Fri Dec 30 06:24:59 2011 New Revision: 228985 URL: http://svn.freebsd.org/changeset/base/228985 Log: Unset the environment variables associated with individual menu items before invoking the kernel. Quoting submitter: The issue is with the new boot loader menu. It adds many loader variables including ones that contain ANSI color escapes. Obviously, these ANSI codes don't play well with serial consoles when kenv(1) is executed without arguments (reports vary as to what happens, but it's never pretty). The net-effect is that kenv(1) no longer reports menu-related variables. In essence, kenv(1) output should now appear the same as on RELENG_8 (which lacks the new boot loader and didn't use any such variables). Thus, restoring serial console glory. Submitted by: Devin Teske devin dott teske fisglobal.com MFC after:2 weeks Modified: head/sys/boot/forth/loader.4th head/sys/boot/forth/menu.4th head/sys/boot/forth/menu.4th.8 Modified: head/sys/boot/forth/loader.4th == --- head/sys/boot/forth/loader.4th Fri Dec 30 04:00:31 2011 (r228984) +++ head/sys/boot/forth/loader.4th Fri Dec 30 06:24:59 2011 (r228985) @@ -41,12 +41,15 @@ s arch-i386 environment? [if] [if] include /boot/support.4th -\ * boot-conf -\ -\ Prepares to boot as specified by loaded configuration files. - only forth also support-functions also builtins definitions +: try-menu-unset + s menu-unset + ['] evaluate catch if +2drop + then +; + : boot 0= if ( interpreted ) get_arguments then @@ -57,24 +60,32 @@ only forth also support-functions also b 0 1 unload drop else s kernelname getenv? if ( a kernel has been loaded ) +try-menu-unset 1 boot exit then load_kernel_and_modules ?dup if exit then + try-menu-unset 0 1 boot exit then else s kernelname getenv? if ( a kernel has been loaded ) + try-menu-unset 1 boot exit then load_kernel_and_modules ?dup if exit then +try-menu-unset 0 1 boot exit then load_kernel_and_modules ?dup 0= if 0 1 boot then ; +\ * boot-conf +\ +\ Prepares to boot as specified by loaded configuration files. + : boot-conf 0= if ( interpreted ) get_arguments then 0 1 unload drop Modified: head/sys/boot/forth/menu.4th == --- head/sys/boot/forth/menu.4thFri Dec 30 04:00:31 2011 (r228984) +++ head/sys/boot/forth/menu.4thFri Dec 30 06:24:59 2011 (r228985) @@ -131,11 +131,11 @@ create init_text8 255 allot \ Print the value of menuidx loader_color? if - . [1m + . [1m ( [22m ) then menuidx @ . loader_color? if - . [37m + . [37m ( [39m ) then \ Move the cursor forward 1 column @@ -897,22 +897,60 @@ create init_text8 255 allot ; \ This function unsets all the possible environment variables associated with -\ creating the interactive menu. Call this when you want to clear the menu -\ area in preparation for another menu. +\ creating the interactive menu. \ -: menu-clear ( -- ) +: menu-unset ( -- ) 49 \ Iterator start (loop range 49 to 56; ASCII '1' to '8') begin - \ basename for caption variable - loader_color? if - s ansi_caption[x] - else - s menu_caption[x] - then + \ Unset variables in-order of appearance in menu.4th(8) + + s menu_caption[x] \ basename for caption variable -rot 2dup 13 + c! rot \ replace 'x' with current iteration unsetenv\ not erroneous to unset unknown var + s menu_command[x] \ command basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s menu_keycode[x] \ keycode basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s ansi_caption[x] \ ANSI caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s toggled_text[x] \ toggle_menuitem caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s toggled_ansi[x] \ toggle_menuitem ANSI caption basename + -rot 2dup 13 + c! rot \ replace 'x' + unsetenv + + s menu_caption[x][y] \ cycle_menuitem caption + -rot 2dup 13 + c! rot \ replace 'x' + 49 -rot + begin + 16 2over rot + c! \ replace 'y' + 2dup unsetenv + +
