svn commit: r228457 - head/share/man/man5
Author: ru Date: Tue Dec 13 08:23:03 2011 New Revision: 228457 URL: http://svn.freebsd.org/changeset/base/228457 Log: The inet keyword in the ifconfig_IF_aliasN is mandatory for IPv4 aliases to work since network.subr@197139. MFC after:3 days Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Tue Dec 13 07:13:48 2011 (r228456) +++ head/share/man/man5/rc.conf.5 Tue Dec 13 08:23:03 2011 (r228457) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd October 23, 2011 +.Dd December 13, 2011 .Dt RC.CONF 5 .Os .Sh NAME @@ -1101,7 +1101,9 @@ ipv4_addrs_ed0=192.0.2.129/27 192.0.2.1 .Pp It is also possible to add IP alias entries using .Xr ifconfig 8 -syntax. +syntax with the +.Dq Li inet +keyword. Assuming that the interface in question was .Li ed0 , it might look @@ -1114,7 +1116,9 @@ ifconfig_ed0_alias1=inet 127.0.0.254 ne And so on. For each .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n -entry that is found, +entry with the +.Dq Li inet +keyword that is found, its contents are passed to .Xr ifconfig 8 . Execution stops at the first unsuccessful access, so if ___ 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: r228457 - head/share/man/man5
On Tue, Dec 13, 2011 at 08:23:03AM +, Ruslan Ermilov wrote: R Author: ru R Date: Tue Dec 13 08:23:03 2011 R New Revision: 228457 R URL: http://svn.freebsd.org/changeset/base/228457 R R Log: R The inet keyword in the ifconfig_IF_aliasN is mandatory for R IPv4 aliases to work since network.subr@197139. I already mentioned to hrs@ and to re@ team that this MUST be mentioned in UPDATING and release notes. Ruslan, since you are already here :) please update relnotes and UPDATING! -- Totus tuus, Glebius. ___ 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: r228458 - head/sbin/dumpfs
Author: ed
Date: Tue Dec 13 09:01:44 2011
New Revision: 228458
URL: http://svn.freebsd.org/changeset/base/228458
Log:
Staticify dumpfs.
This tool only consists of a single C file, so we can simply mark
everything except main() static. This seems to shave off about 8% of the
binary size.
Modified:
head/sbin/dumpfs/dumpfs.c
Modified: head/sbin/dumpfs/dumpfs.c
==
--- head/sbin/dumpfs/dumpfs.c Tue Dec 13 08:23:03 2011(r228457)
+++ head/sbin/dumpfs/dumpfs.c Tue Dec 13 09:01:44 2011(r228458)
@@ -79,16 +79,16 @@ static const char rcsid[] =
static struct uufsd disk;
-intdumpfs(const char *);
-intdumpfsid(void);
-intdumpcg(void);
-intdumpfreespace(const char *, int);
-void dumpfreespacecg(int);
-intmarshal(const char *);
-void pbits(void *, int);
-void pblklist(void *, int, off_t, int);
-void ufserr(const char *);
-void usage(void) __dead2;
+static int dumpfs(const char *);
+static int dumpfsid(void);
+static int dumpcg(void);
+static int dumpfreespace(const char *, int);
+static voiddumpfreespacecg(int);
+static int marshal(const char *);
+static voidpbits(void *, int);
+static voidpblklist(void *, int, off_t, int);
+static voidufserr(const char *);
+static voidusage(void) __dead2;
int
main(int argc, char *argv[])
@@ -143,7 +143,7 @@ main(int argc, char *argv[])
exit(eval);
}
-int
+static int
dumpfsid(void)
{
@@ -151,7 +151,7 @@ dumpfsid(void)
return 0;
}
-int
+static int
dumpfs(const char *name)
{
time_t fstime;
@@ -309,7 +309,7 @@ err:ufserr(name);
return (1);
}
-int
+static int
dumpcg(void)
{
time_t cgtime;
@@ -370,7 +370,7 @@ dumpcg(void)
return (0);
}
-int
+static int
dumpfreespace(const char *name, int fflag)
{
int i;
@@ -386,7 +386,7 @@ err:
return (1);
}
-void
+static void
dumpfreespacecg(int fflag)
{
@@ -394,7 +394,7 @@ dumpfreespacecg(int fflag)
fflag);
}
-int
+static int
marshal(const char *name)
{
struct fs *fs;
@@ -444,7 +444,7 @@ marshal(const char *name)
return 0;
}
-void
+static void
pbits(void *vp, int max)
{
int i;
@@ -466,7 +466,7 @@ pbits(void *vp, int max)
printf(\n);
}
-void
+static void
pblklist(void *vp, int max, off_t offset, int fflag)
{
int i, j;
@@ -487,7 +487,7 @@ pblklist(void *vp, int max, off_t offset
}
}
-void
+static void
ufserr(const char *name)
{
if (disk.d_error != NULL)
@@ -496,7 +496,7 @@ ufserr(const char *name)
warn(%s, name);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr, usage: dumpfs [-fm] filesys | device\n);
___
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: r228462 - head/share/examples/scsi_target
Author: mav
Date: Tue Dec 13 11:13:28 2011
New Revision: 228462
URL: http://svn.freebsd.org/changeset/base/228462
Log:
- Fix different variable types use in different files after r121184,
causing problems on amd64.
- s/%lud/%lu/.
MFC after:1 month
Modified:
head/share/examples/scsi_target/scsi_cmds.c
Modified: head/share/examples/scsi_target/scsi_cmds.c
==
--- head/share/examples/scsi_target/scsi_cmds.c Tue Dec 13 09:58:05 2011
(r228461)
+++ head/share/examples/scsi_target/scsi_cmds.c Tue Dec 13 11:13:28 2011
(r228462)
@@ -103,8 +103,8 @@ static struct targ_cdb_handlers cdb_hand
static struct scsi_inquiry_data inq_data;
static struct initiator_state istates[MAX_INITIATORS];
extern int debug;
-extern uint64_tvolume_size;
-extern size_t sector_size;
+extern off_t volume_size;
+extern u_int sector_size;
extern size_t buf_size;
cam_status
@@ -609,7 +609,7 @@ start_io(struct ccb_accept_tio *atio, st
if (dir == CAM_DIR_IN) {
if (notaio) {
if (debug)
- warnx(read sync %lud @ block OFF_FMT,
+ warnx(read sync %lu @ block OFF_FMT,
(unsigned long)
(ctio-dxfer_len / sector_size),
c_descr-offset / sector_size);
@@ -625,7 +625,7 @@ start_io(struct ccb_accept_tio *atio, st
}
} else {
if (debug)
- warnx(read async %lud @ block OFF_FMT,
+ warnx(read async %lu @ block OFF_FMT,
(unsigned long)
(ctio-dxfer_len / sector_size),
c_descr-offset / sector_size);
@@ -725,7 +725,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *at
a_descr-targ_req += ctio-dxfer_len;
if (notaio) {
if (debug)
- warnx(write sync %lud @ block
+ warnx(write sync %lu @ block
OFF_FMT, (unsigned long)
(ctio-dxfer_len / sector_size),
c_descr-offset / sector_size);
@@ -742,7 +742,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *at
tcmd_rdwr_done(atio, ctio, AIO_DONE);
} else {
if (debug)
- warnx(write async %lud @ block
+ warnx(write async %lu @ block
OFF_FMT, (unsigned long)
(ctio-dxfer_len / sector_size),
c_descr-offset / sector_size);
___
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: r228463 - head/sbin/dhclient
Author: glebius Date: Tue Dec 13 11:54:51 2011 New Revision: 228463 URL: http://svn.freebsd.org/changeset/base/228463 Log: dhclient-script relied on incorrect behavior of SIOCAIFADDR ioctl, that changed 0.0.0.0/0.0.0.0 prefix to 0.0.0.0/255.0.0.0. In the r228313 this behavior was fixed, and since dhclient-script got broken. I'm not sure this fix is a perfect one, it just changes dhclient-script to set 0.0.0.0/255.0.0.0 explicitly. PR: kern/163206 Modified: head/sbin/dhclient/dhclient-script Modified: head/sbin/dhclient/dhclient-script == --- head/sbin/dhclient/dhclient-script Tue Dec 13 11:13:28 2011 (r228462) +++ head/sbin/dhclient/dhclient-script Tue Dec 13 11:54:51 2011 (r228463) @@ -320,7 +320,7 @@ MEDIUM) PREINIT) delete_old_alias - $IFCONFIG $interface inet alias 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up + $IFCONFIG $interface inet alias 0.0.0.0 netmask 255.0.0.0 broadcast 255.255.255.255 up ;; ARPCHECK|ARPSEND) ___ 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: r197139 - in head/etc: . rc.d
On Sat, Sep 12, 2009 at 10:13:41PM +, Hiroki Sato wrote: Author: hrs Date: Sat Sep 12 22:13:41 2009 New Revision: 197139 URL: http://svn.freebsd.org/changeset/base/197139 Log: Integrate rc.d/network_ipv6 into rc.d/netif: - Add rc.d/stf and rc.d/faith for stf(4) and faith(4). - Remove rc.d/auto_linklocal and rc.d/network_ipv6. - Move rc.d/sysctl to just before FILESYSTEMS because rc.d/netif depends on some sysctl variables. Is this true that after this commit 'inet' is required for ifconfig_name_alias variables? If that's true, this is huge POLA violation and I'd really reconsider or found a way to make 'inet' not to be required. -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com pgpYKw18YA30T.pgp Description: PGP signature
svn commit: r228468 - in head: include sys/dev/uart sys/sys usr.bin/mail
Author: ed
Date: Tue Dec 13 13:32:56 2011
New Revision: 228468
URL: http://svn.freebsd.org/changeset/base/228468
Log:
Replace __const by const in all non-contributed source code.
As C1X is close to being released, there is no need to wrap around a
feature that is already part of C90. Most of these files already use
`const' in different placed as well.
Modified:
head/include/netdb.h
head/include/regex.h
head/include/signal.h
head/include/stdio.h
head/include/stdlib.h
head/sys/dev/uart/uart_subr.c
head/sys/sys/types.h
head/usr.bin/mail/extern.h
head/usr.bin/mail/lex.c
Modified: head/include/netdb.h
==
--- head/include/netdb.hTue Dec 13 13:03:11 2011(r228467)
+++ head/include/netdb.hTue Dec 13 13:32:56 2011(r228468)
@@ -276,7 +276,7 @@ int getservbyport_r(int, const char *,
intgetservent_r(struct servent *, char *, size_t,
struct servent **);
void herror(const char *);
-__const char *hstrerror(int);
+const char *hstrerror(int);
intinnetgr(const char *, const char *, const char *, const char *);
void setnetgrent(const char *);
#endif
Modified: head/include/regex.h
==
--- head/include/regex.hTue Dec 13 13:03:11 2011(r228467)
+++ head/include/regex.hTue Dec 13 13:32:56 2011(r228468)
@@ -51,7 +51,7 @@ typedef __size_tsize_t;
typedef struct {
int re_magic;
size_t re_nsub; /* number of parenthesized subexpressions */
- __const char *re_endp; /* end pointer for REG_PEND */
+ const char *re_endp;/* end pointer for REG_PEND */
struct re_guts *re_g; /* none of your business :-) */
} regex_t;
Modified: head/include/signal.h
==
--- head/include/signal.h Tue Dec 13 13:03:11 2011(r228467)
+++ head/include/signal.h Tue Dec 13 13:32:56 2011(r228468)
@@ -42,9 +42,9 @@
* XXX should enlarge these, if only to give empty names instead of bounds
* errors for large signal numbers.
*/
-extern __const char *__const sys_signame[NSIG];
-extern __const char *__const sys_siglist[NSIG];
-extern __const int sys_nsig;
+extern const char * const sys_signame[NSIG];
+extern const char * const sys_siglist[NSIG];
+extern const int sys_nsig;
#endif
#if __POSIX_VISIBLE = 200112 || __XSI_VISIBLE
Modified: head/include/stdio.h
==
--- head/include/stdio.hTue Dec 13 13:03:11 2011(r228467)
+++ head/include/stdio.hTue Dec 13 13:32:56 2011(r228468)
@@ -404,8 +404,8 @@ int vasprintf(char **, const char *, __
* positive errno values. Use strerror() or strerror_r() from string.h
* instead.
*/
-extern __const int sys_nerr;
-extern __const char *__const sys_errlist[];
+extern const int sys_nerr;
+extern const char * const sys_errlist[];
/*
* Stdio function-access interface.
Modified: head/include/stdlib.h
==
--- head/include/stdlib.h Tue Dec 13 13:03:11 2011(r228467)
+++ head/include/stdlib.h Tue Dec 13 13:32:56 2011(r228468)
@@ -271,7 +271,7 @@ char*devname_r(__dev_t, __mode_t, char
char *fdevname(int);
char *fdevname_r(int, char *, int);
int getloadavg(double [], int);
-__const char *
+const char *
getprogname(void);
int heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
Modified: head/sys/dev/uart/uart_subr.c
==
--- head/sys/dev/uart/uart_subr.c Tue Dec 13 13:03:11 2011
(r228467)
+++ head/sys/dev/uart/uart_subr.c Tue Dec 13 13:32:56 2011
(r228468)
@@ -56,13 +56,13 @@ static struct uart_class *uart_classes[]
static size_t uart_nclasses = sizeof(uart_classes) / sizeof(uart_classes[0]);
static bus_addr_t
-uart_parse_addr(__const char **p)
+uart_parse_addr(const char **p)
{
return (strtoul(*p, (char**)(uintptr_t)p, 0));
}
static struct uart_class *
-uart_parse_class(struct uart_class *class, __const char **p)
+uart_parse_class(struct uart_class *class, const char **p)
{
struct uart_class *uc;
const char *nm;
@@ -84,13 +84,13 @@ uart_parse_class(struct uart_class *clas
}
static long
-uart_parse_long(__const char **p)
+uart_parse_long(const char **p)
{
return (strtol(*p, (char**)(uintptr_t)p, 0));
}
static int
-uart_parse_parity(__const char **p)
+uart_parse_parity(const char **p)
{
if (!strncmp(*p, even, 4)) {
*p += 4;
@@ -116,7 +116,7 @@ uart_parse_parity(__const char **p)
}
static int
-uart_parse_tag(__const
svn commit: r228469 - in head/sys: amd64/include arm/include i386/include ia64/include mips/include ofed/include/asm powerpc/include sparc64/include
Author: ed Date: Tue Dec 13 13:38:03 2011 New Revision: 228469 URL: http://svn.freebsd.org/changeset/base/228469 Log: Replace __signed by signed. The signed keyword is an integral part of the C syntax. There's no need to use __signed. Modified: head/sys/amd64/include/_types.h head/sys/arm/include/_types.h head/sys/i386/include/_types.h head/sys/ia64/include/_types.h head/sys/mips/include/_types.h head/sys/ofed/include/asm/types.h head/sys/powerpc/include/_types.h head/sys/sparc64/include/_types.h Modified: head/sys/amd64/include/_types.h == --- head/sys/amd64/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/amd64/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -48,7 +48,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort __int16_t; typedefunsigned short __uint16_t; Modified: head/sys/arm/include/_types.h == --- head/sys/arm/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/arm/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -46,7 +46,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort __int16_t; typedefunsigned short __uint16_t; Modified: head/sys/i386/include/_types.h == --- head/sys/i386/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/i386/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -48,7 +48,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort __int16_t; typedefunsigned short __uint16_t; Modified: head/sys/ia64/include/_types.h == --- head/sys/ia64/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/ia64/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -46,7 +46,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort __int16_t; typedefunsigned short __uint16_t; Modified: head/sys/mips/include/_types.h == --- head/sys/mips/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/mips/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -47,7 +47,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort __int16_t; typedefunsigned short __uint16_t; Modified: head/sys/ofed/include/asm/types.h == --- head/sys/ofed/include/asm/types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/ofed/include/asm/types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -30,17 +30,17 @@ typedef unsigned short umode_t; -typedef __signed__ char __s8; +typedef signed char __s8; typedef unsigned char __u8; -typedef __signed__ short __s16; +typedef signed short __s16; typedef unsigned short __u16; -typedef __signed__ int __s32; +typedef signed int __s32; typedef unsigned int __u32; #if defined(__GNUC__) // !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; +typedef signed long long __s64; typedef unsigned long long __u64; #endif Modified: head/sys/powerpc/include/_types.h == --- head/sys/powerpc/include/_types.h Tue Dec 13 13:32:56 2011 (r228468) +++ head/sys/powerpc/include/_types.h Tue Dec 13 13:38:03 2011 (r228469) @@ -46,7 +46,7 @@ /* * Basic types upon which most other types are built. */ -typedef__signed char __int8_t; +typedefsigned char __int8_t; typedefunsigned char __uint8_t; typedefshort
svn commit: r228470 - head/sys/kern
Author: eadler (ports committer)
Date: Tue Dec 13 14:00:27 2011
New Revision: 228470
URL: http://svn.freebsd.org/changeset/base/228470
Log:
- Add a sysctl to allow non-root users the ability to set idle
priorities.
- While here fix up some style nits.
Discussed with: cperciva (breifly)
Reviewed by: pjd (earlier version)
Reviewed by: bde
Approved by: jhb
MFC after:1 month
Modified:
head/sys/kern/kern_resource.c
Modified: head/sys/kern/kern_resource.c
==
--- head/sys/kern/kern_resource.c Tue Dec 13 13:38:03 2011
(r228469)
+++ head/sys/kern/kern_resource.c Tue Dec 13 14:00:27 2011
(r228470)
@@ -56,6 +56,7 @@ __FBSDID($FreeBSD$);
#include sys/sched.h
#include sys/sx.h
#include sys/syscallsubr.h
+#include sys/sysctl.h
#include sys/sysent.h
#include sys/time.h
#include sys/umtx.h
@@ -273,6 +274,10 @@ donice(struct thread *td, struct proc *p
return (0);
}
+static int unprivileged_idprio;
+SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_idprio, CTLFLAG_RW,
+unprivileged_idprio, 0, Allow non-root users to set an idle priority);
+
/*
* Set realtime priority for LWP.
*/
@@ -321,18 +326,26 @@ sys_rtprio_thread(struct thread *td, str
break;
/* Disallow setting rtprio in most cases if not superuser. */
-/*
- * Realtime priority has to be restricted for reasons which should be
- * obvious. However, for idle priority, there is a potential for
- * system deadlock if an idleprio process gains a lock on a resource
- * that other processes need (and the idleprio process can't run
- * due to a CPU-bound normal process). Fix me! XXX
- */
-#if 0
- if (RTP_PRIO_IS_REALTIME(rtp.type)) {
-#else
- if (rtp.type != RTP_PRIO_NORMAL) {
-#endif
+
+ /*
+* Realtime priority has to be restricted for reasons which
+* should be obvious. However, for idleprio processes, there is
+* a potential for system deadlock if an idleprio process gains
+* a lock on a resource that other processes need (and the
+* idleprio process can't run due to a CPU-bound normal
+* process). Fix me! XXX
+*
+* This problem is not only related to idleprio process.
+* A user level program can obtain a file lock and hold it
+* indefinitely. Additionally, without idleprio processes it is
+* still conceivable that a program with low priority will never
+* get to run. In short, allowing this feature might make it
+* easier to lock a resource indefinitely, but it is not the
+* only thing that makes it possible.
+*/
+ if (RTP_PRIO_BASE(rtp.type) == RTP_PRIO_REALTIME ||
+ (RTP_PRIO_BASE(rtp.type) == RTP_PRIO_IDLE
+ unprivileged_idprio == 0)) {
error = priv_check(td, PRIV_SCHED_RTPRIO);
if (error)
break;
@@ -417,19 +430,14 @@ sys_rtprio(td, uap)
if ((error = p_cansched(td, p)) || (error = cierror))
break;
- /* Disallow setting rtprio in most cases if not superuser. */
-/*
- * Realtime priority has to be restricted for reasons which should be
- * obvious. However, for idle priority, there is a potential for
- * system deadlock if an idleprio process gains a lock on a resource
- * that other processes need (and the idleprio process can't run
- * due to a CPU-bound normal process). Fix me! XXX
- */
-#if 0
- if (RTP_PRIO_IS_REALTIME(rtp.type)) {
-#else
- if (rtp.type != RTP_PRIO_NORMAL) {
-#endif
+ /*
+* Disallow setting rtprio in most cases if not superuser.
+* See the comment in sys_rtprio_thread about idprio
+* threads holding a lock.
+*/
+ if (RTP_PRIO_BASE(rtp.type) == RTP_PRIO_REALTIME ||
+ (RTP_PRIO_BASE(rtp.type) == RTP_PRIO_IDLE
+ !unprivileged_idprio)) {
error = priv_check(td, PRIV_SCHED_RTPRIO);
if (error)
break;
___
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: r228469 - in head/sys: amd64/include arm/include i386/include ia64/include mips/include ofed/include/asm powerpc/include sparc64/include
On Tue, Dec 13, 2011, Ed Schouten wrote: Author: ed Date: Tue Dec 13 13:38:03 2011 New Revision: 228469 URL: http://svn.freebsd.org/changeset/base/228469 Log: Replace __signed by signed. The signed keyword is an integral part of the C syntax. There's no need to use __signed. For what it's worth, I believe __signed and __const were intended to support gcc's -traditional flag, which was needed to get some pre-ANSI programs to compile. But any vestiges of pre-ANSI support probably rotted a long time ago, and the -traditional option isn't supported anymore in gcc. ___ 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: r228471 - in head/sys: boot/arm/at91/libat91 dev/cm dev/de dev/fdc dev/pccard dev/spibus dev/xen/netback pc98/cbus
Author: ed
Date: Tue Dec 13 14:06:01 2011
New Revision: 228471
URL: http://svn.freebsd.org/changeset/base/228471
Log:
Replace `inline static' by `static inline'.
If I interpret the C standard correctly, the storage specifier should be
placed before the inline keyword. While at it, replace __inline by
inline in the files affected.
Modified:
head/sys/boot/arm/at91/libat91/sd-card.c
head/sys/dev/cm/smc90cx6.c
head/sys/dev/de/if_de.c
head/sys/dev/fdc/fdc.c
head/sys/dev/pccard/pccardvar.h
head/sys/dev/spibus/spibusvar.h
head/sys/dev/xen/netback/netback.c
head/sys/pc98/cbus/scterm-sck.c
head/sys/pc98/cbus/scvtb.c
Modified: head/sys/boot/arm/at91/libat91/sd-card.c
==
--- head/sys/boot/arm/at91/libat91/sd-card.cTue Dec 13 14:00:27 2011
(r228470)
+++ head/sys/boot/arm/at91/libat91/sd-card.cTue Dec 13 14:06:01 2011
(r228471)
@@ -94,14 +94,14 @@ MCIDeviceWaitReady(unsigned int timeout)
} // End of if AT91C_MCI_RXBUFF
}
-inline static unsigned int
+static inline unsigned int
swap(unsigned int a)
{
return (((a 0xff) 24) | ((a 0xff00) 8) | ((a 0xff) 8)
| ((a 0xff00) 24));
}
-inline static void
+static inline void
wait_ready()
{
int status;
Modified: head/sys/dev/cm/smc90cx6.c
==
--- head/sys/dev/cm/smc90cx6.c Tue Dec 13 14:00:27 2011(r228470)
+++ head/sys/dev/cm/smc90cx6.c Tue Dec 13 14:06:01 2011(r228471)
@@ -596,7 +596,7 @@ cleanup:
}
}
-__inline static void
+static inline void
cm_tint_locked(sc, isr)
struct cm_softc *sc;
int isr;
Modified: head/sys/dev/de/if_de.c
==
--- head/sys/dev/de/if_de.c Tue Dec 13 14:00:27 2011(r228470)
+++ head/sys/dev/de/if_de.c Tue Dec 13 14:06:01 2011(r228471)
@@ -1567,7 +1567,7 @@ tulip_null_media_poll(tulip_softc_t * co
#endif
}
-__inline static void
+static inline void
tulip_21140_mediainit(tulip_softc_t * const sc, tulip_media_info_t * const mip,
tulip_media_t const media, unsigned gpdata, unsigned cmdmode)
{
Modified: head/sys/dev/fdc/fdc.c
==
--- head/sys/dev/fdc/fdc.c Tue Dec 13 14:00:27 2011(r228470)
+++ head/sys/dev/fdc/fdc.c Tue Dec 13 14:06:01 2011(r228471)
@@ -314,14 +314,14 @@ fdsettype(struct fd_data *fd, struct fd_
/*
* Bus space handling (access to low-level IO).
*/
-__inline static void
+static inline void
fdregwr(struct fdc_data *fdc, int reg, uint8_t v)
{
bus_space_write_1(fdc-iot, fdc-ioh[reg], fdc-ioff[reg], v);
}
-__inline static uint8_t
+static inline uint8_t
fdregrd(struct fdc_data *fdc, int reg)
{
Modified: head/sys/dev/pccard/pccardvar.h
==
--- head/sys/dev/pccard/pccardvar.h Tue Dec 13 14:00:27 2011
(r228470)
+++ head/sys/dev/pccard/pccardvar.h Tue Dec 13 14:06:01 2011
(r228471)
@@ -106,7 +106,7 @@ typedef int (*pccard_product_match_fn) (
* make this inline so that we don't have to worry about dangling references
* to it in the modules or the code.
*/
-static __inline const struct pccard_product *
+static inline const struct pccard_product *
pccard_product_lookup(device_t dev, const struct pccard_product *tab,
size_t ent_size, pccard_product_match_fn matchfn)
{
@@ -150,31 +150,31 @@ pccard_product_lookup(device_t dev, cons
/* Convenience functions */
-static __inline int
+static inline int
pccard_cis_scan(device_t dev, pccard_scan_t fct, void *arg)
{
return (CARD_CIS_SCAN(device_get_parent(dev), dev, fct, arg));
}
-static __inline int
+static inline int
pccard_attr_read_1(device_t dev, uint32_t offset, uint8_t *val)
{
return (CARD_ATTR_READ(device_get_parent(dev), dev, offset, val));
}
-static __inline int
+static inline int
pccard_attr_write_1(device_t dev, uint32_t offset, uint8_t val)
{
return (CARD_ATTR_WRITE(device_get_parent(dev), dev, offset, val));
}
-static __inline int
+static inline int
pccard_ccr_read_1(device_t dev, uint32_t offset, uint8_t *val)
{
return (CARD_CCR_READ(device_get_parent(dev), dev, offset, val));
}
-static __inline int
+static inline int
pccard_ccr_write_1(device_t dev, uint32_t offset, uint8_t val)
{
return (CARD_CCR_WRITE(device_get_parent(dev), dev, offset, val));
@@ -199,7 +199,7 @@ enum {
};
#define PCCARD_ACCESSOR(A, B, T) \
-__inline static int\
+static inline int \
pccard_get_ ## A(device_t dev, T *t) \
{
svn commit: r228472 - head/etc
Author: glebius
Date: Tue Dec 13 14:36:04 2011
New Revision: 228472
URL: http://svn.freebsd.org/changeset/base/228472
Log:
Add compatibility support for specifing IPv4 aliases in
rc.conf without the inet keyword.
Obtained from:hrs
Modified:
head/etc/network.subr
Modified: head/etc/network.subr
==
--- head/etc/network.subr Tue Dec 13 14:06:01 2011(r228471)
+++ head/etc/network.subr Tue Dec 13 14:36:04 2011(r228472)
@@ -716,9 +716,16 @@ ifalias_ipv4_up()
inet\ *)
ifconfig $1 ${ifconfig_args} alias _ret=0
;;
+ inet6\ *)
+ ;;
)
break
;;
+ *)
+ warn \$ifconfig_$1_alias${alias} needs \
+ \inet\ keyword for an IPv4 address.
+ ifconfig $1 ${ifconfig_args} alias _ret=0
+ ;;
esac
alias=$((${alias} + 1))
done
___
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: r228473 - head/lib/libedit
Author: ed Date: Tue Dec 13 14:53:26 2011 New Revision: 228473 URL: http://svn.freebsd.org/changeset/base/228473 Log: Don't use __P(). The rest of the file doesn't use it either and according to style(9), it should not be used. Modified: head/lib/libedit/histedit.h Modified: head/lib/libedit/histedit.h == --- head/lib/libedit/histedit.h Tue Dec 13 14:36:04 2011(r228472) +++ head/lib/libedit/histedit.h Tue Dec 13 14:53:26 2011(r228473) @@ -158,8 +158,8 @@ void el_resize(EditLine *); /* * Set user private data. */ -voidel_data_set__P((EditLine *, void *)); -void * el_data_get__P((EditLine *)); +voidel_data_set(EditLine *, void *); +void * el_data_get(EditLine *); /* * User-defined function interface. ___ 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: r228470 - head/sys/kern
On Tue, Dec 13, 2011 at 02:00:28PM +, Eitan Adler wrote:
Author: eadler (ports committer)
Date: Tue Dec 13 14:00:27 2011
New Revision: 228470
URL: http://svn.freebsd.org/changeset/base/228470
Log:
- Add a sysctl to allow non-root users the ability to set idle
priorities.
[...]
I'd suggest using consistent style with those two:
[...]
+ unprivileged_idprio == 0)) {
[...]
+ !unprivileged_idprio)) {
[...]
Because it should be either 0 or 1, the latter is better.
--
Pawel Jakub Dawidek http://www.wheelsystems.com
FreeBSD committer http://www.FreeBSD.org
Am I Evil? Yes, I Am! http://yomoli.com
pgpZzK2DiyF99.pgp
Description: PGP signature
svn commit: r228474 - in head/contrib/gcclibs/libcpp: . include
Author: ed Date: Tue Dec 13 17:34:47 2011 New Revision: 228474 URL: http://svn.freebsd.org/changeset/base/228474 Log: Add support for __COUNTER__. __COUNTER__ allows one to obtain incrementing (read: unique) numbers from the C preprocesor. This is useful when implementing things like a robust implementation of CTASSERT(), which currently fails when using it more than once on a single line of code. Probably not likely to cause any breakage, but still. __COUNTER__ was also added to GCC 4.3, but since that implementation is GPLv3 licensed, I took the liberty of implementing it without looking at any upstream sources. Therefore, this version is licensed under the same license as the rest of the code; GPLv2. Modified: head/contrib/gcclibs/libcpp/include/cpplib.h head/contrib/gcclibs/libcpp/init.c head/contrib/gcclibs/libcpp/internal.h head/contrib/gcclibs/libcpp/macro.c Modified: head/contrib/gcclibs/libcpp/include/cpplib.h == --- head/contrib/gcclibs/libcpp/include/cpplib.hTue Dec 13 14:53:26 2011(r228473) +++ head/contrib/gcclibs/libcpp/include/cpplib.hTue Dec 13 17:34:47 2011(r228474) @@ -555,7 +555,8 @@ enum builtin_type BT_TIME, /* `__TIME__' */ BT_STDC, /* `__STDC__' */ BT_PRAGMA, /* `_Pragma' operator */ - BT_TIMESTAMP /* `__TIMESTAMP__' */ + BT_TIMESTAMP,/* `__TIMESTAMP__' */ + BT_COUNTER /* `__COUNTER__' */ }; #define CPP_HASHNODE(HNODE)((cpp_hashnode *) (HNODE)) Modified: head/contrib/gcclibs/libcpp/init.c == --- head/contrib/gcclibs/libcpp/init.c Tue Dec 13 14:53:26 2011 (r228473) +++ head/contrib/gcclibs/libcpp/init.c Tue Dec 13 17:34:47 2011 (r228474) @@ -308,6 +308,7 @@ static const struct builtin builtin_arra B(__BASE_FILE__,BT_BASE_FILE), B(__LINE__, BT_SPECLINE), B(__INCLUDE_LEVEL__, BT_INCLUDE_LEVEL), + B(__COUNTER__, BT_COUNTER), /* Keep builtins not used for -traditional-cpp at the end, and update init_builtins() if any more are added. */ B(_Pragma, BT_PRAGMA), Modified: head/contrib/gcclibs/libcpp/internal.h == --- head/contrib/gcclibs/libcpp/internal.h Tue Dec 13 14:53:26 2011 (r228473) +++ head/contrib/gcclibs/libcpp/internal.h Tue Dec 13 17:34:47 2011 (r228474) @@ -448,6 +448,8 @@ struct cpp_reader /* A saved list of the defined macros, for dependency checking of precompiled headers. */ struct cpp_savedstate *savedstate; + + unsigned int nextcounter; }; /* Character classes. Based on the more primitive macros in safe-ctype.h. Modified: head/contrib/gcclibs/libcpp/macro.c == --- head/contrib/gcclibs/libcpp/macro.c Tue Dec 13 14:53:26 2011 (r228473) +++ head/contrib/gcclibs/libcpp/macro.c Tue Dec 13 17:34:47 2011 (r228474) @@ -262,6 +262,10 @@ _cpp_builtin_macro_text (cpp_reader *pfi else result = pfile-time; break; + +case BT_COUNTER: + number = pfile-nextcounter++; + break; } if (result == NULL) ___ 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: r228475 - head/sys/kern
Author: obrien Date: Tue Dec 13 17:59:16 2011 New Revision: 228475 URL: http://svn.freebsd.org/changeset/base/228475 Log: Disallow various debug.kdb sysctl's when securelevel is raised. PR: 161350 Modified: head/sys/kern/kern_shutdown.c Modified: head/sys/kern/kern_shutdown.c == --- head/sys/kern/kern_shutdown.c Tue Dec 13 17:34:47 2011 (r228474) +++ head/sys/kern/kern_shutdown.c Tue Dec 13 17:59:16 2011 (r228475) @@ -102,8 +102,9 @@ int debugger_on_panic = 0; #else int debugger_on_panic = 1; #endif -SYSCTL_INT(_debug, OID_AUTO, debugger_on_panic, CTLFLAG_RW | CTLFLAG_TUN, - debugger_on_panic, 0, Run debugger on kernel panic); +SYSCTL_INT(_debug, OID_AUTO, debugger_on_panic, +CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, debugger_on_panic, 0, +Run debugger on kernel panic); TUNABLE_INT(debug.debugger_on_panic, debugger_on_panic); #ifdef KDB_TRACE @@ -111,8 +112,9 @@ static int trace_on_panic = 1; #else static int trace_on_panic = 0; #endif -SYSCTL_INT(_debug, OID_AUTO, trace_on_panic, CTLFLAG_RW | CTLFLAG_TUN, - trace_on_panic, 0, Print stack trace on kernel panic); +SYSCTL_INT(_debug, OID_AUTO, trace_on_panic, +CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, trace_on_panic, 0, +Print stack trace on kernel panic); TUNABLE_INT(debug.trace_on_panic, trace_on_panic); #endif /* KDB */ ___ 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: r228476 - head/sys/dev/bce
Author: yongari
Date: Tue Dec 13 18:11:25 2011
New Revision: 228476
URL: http://svn.freebsd.org/changeset/base/228476
Log:
Rework link state tracking and remove superfluous link UP/DOWN
messages.
o Add check for actually resolved speed in miibus_statchg callback
instead of blindly reprogramming BCE_EMAC_MODE register. The
callback may be called multiple times(e.g. link UP, link
transition, auto-negotiate complete etc) while auto-negotiation
is in progress. All unresolved link state changes are ignored
now and setting BCE_EMAC_MODE after link establishment is done
once.
o bce(4) is careful enough not to drive MII_TICK if driver got a
valid link. To detect lost link, bce(4) relied on link state
change interrupt and if driver see the interrupt, it forced to
drive MII_TICK by calling bce_tick() in interrupt handler.
Because bce(4) generates multiple link state change interrupts
while auto-negotiation is in progress, bce_tick() would be
called multiple times and this resulted in generating multiple
link UP/DOWN messages.
With this change, bce_tick() is not called in interrupt handler
anymore such that miibus_statchg callback handles link state
changes with consistent manner.
Reviewed by: davidch
Modified:
head/sys/dev/bce/if_bce.c
head/sys/dev/bce/if_bcereg.h
Modified: head/sys/dev/bce/if_bce.c
==
--- head/sys/dev/bce/if_bce.c Tue Dec 13 17:59:16 2011(r228475)
+++ head/sys/dev/bce/if_bce.c Tue Dec 13 18:11:25 2011(r228476)
@@ -1982,6 +1982,7 @@ static void
bce_miibus_statchg(device_t dev)
{
struct bce_softc *sc;
+ struct ifnet *ifp;
struct mii_data *mii;
int val;
@@ -1989,42 +1990,57 @@ bce_miibus_statchg(device_t dev)
DBENTER(BCE_VERBOSE_PHY);
+ ifp = sc-bce_ifp;
mii = device_get_softc(sc-bce_miibus);
+ if (mii == NULL || ifp == NULL ||
+ (ifp-if_drv_flags IFF_DRV_RUNNING) == 0)
+ return;
+ sc-bce_link_up = FALSE;
val = REG_RD(sc, BCE_EMAC_MODE);
val = ~(BCE_EMAC_MODE_PORT | BCE_EMAC_MODE_HALF_DUPLEX |
BCE_EMAC_MODE_MAC_LOOP | BCE_EMAC_MODE_FORCE_LINK |
BCE_EMAC_MODE_25G);
/* Set MII or GMII interface based on the PHY speed. */
- switch (IFM_SUBTYPE(mii-mii_media_active)) {
- case IFM_10_T:
- if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) {
- DBPRINT(sc, BCE_INFO_PHY,
- Enabling 10Mb interface.\n);
- val |= BCE_EMAC_MODE_PORT_MII_10;
+ if ((mii-mii_media_status (IFM_ACTIVE | IFM_AVALID)) ==
+ (IFM_ACTIVE | IFM_AVALID)) {
+ switch (IFM_SUBTYPE(mii-mii_media_active)) {
+ case IFM_10_T:
+ if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) {
+ DBPRINT(sc, BCE_INFO_PHY,
+ Enabling 10Mb interface.\n);
+ val |= BCE_EMAC_MODE_PORT_MII_10;
+ sc-bce_link_up = TRUE;
+ break;
+ }
+ /* FALLTHROUGH */
+ case IFM_100_TX:
+ DBPRINT(sc, BCE_INFO_PHY, Enabling MII interface.\n);
+ val |= BCE_EMAC_MODE_PORT_MII;
+ sc-bce_link_up = TRUE;
+ break;
+ case IFM_2500_SX:
+ DBPRINT(sc, BCE_INFO_PHY, Enabling 2.5G MAC mode.\n);
+ val |= BCE_EMAC_MODE_25G;
+ /* FALLTHROUGH */
+ case IFM_1000_T:
+ case IFM_1000_SX:
+ DBPRINT(sc, BCE_INFO_PHY, Enabling GMII interface.\n);
+ val |= BCE_EMAC_MODE_PORT_GMII;
+ sc-bce_link_up = TRUE;
+ if (bce_verbose || bootverbose)
+ BCE_PRINTF(Gigabit link up!\n);
+ break;
+ default:
+ DBPRINT(sc, BCE_INFO_PHY, Unknown link speed.\n);
break;
}
- /* fall-through */
- case IFM_100_TX:
- DBPRINT(sc, BCE_INFO_PHY, Enabling MII interface.\n);
- val |= BCE_EMAC_MODE_PORT_MII;
- break;
- case IFM_2500_SX:
- DBPRINT(sc, BCE_INFO_PHY, Enabling 2.5G MAC mode.\n);
- val |= BCE_EMAC_MODE_25G;
- /* fall-through */
- case IFM_1000_T:
- case IFM_1000_SX:
- DBPRINT(sc, BCE_INFO_PHY, Enabling GMII interface.\n);
- val |= BCE_EMAC_MODE_PORT_GMII;
- break;
- default:
- DBPRINT(sc, BCE_INFO_PHY, Unknown link speed, enabling
-
r228377 to r228473 top not working
Hi all! I have uname -a FreeBSD nonamehost 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r228473M: Tue Dec 13 20:09:45 EET 2011 ivan@nonamehost:/usr/obj/usr/src/sys/mk9 amd64 After update source code from r228377 to r228473 top stopped working # top top: sysctl(vm.stats.vm.v_active_count...) failed: No such file or directory # There are some ideas? Thanks! ___ 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: r228477 - head/sys/sys
Author: ed
Date: Tue Dec 13 19:37:27 2011
New Revision: 228477
URL: http://svn.freebsd.org/changeset/base/228477
Log:
Make support for C1X keywords more complete.
- _Alignof(), which returns the aligment of a certain type.
- _Static_assert(), which can be used to check compile-time assertions.
- _Thread_local, which uses TLS on a variable.
MFC after:3 months
Reviewed by: mdf
Modified:
head/sys/sys/cdefs.h
Modified: head/sys/sys/cdefs.h
==
--- head/sys/sys/cdefs.hTue Dec 13 18:11:25 2011(r228476)
+++ head/sys/sys/cdefs.hTue Dec 13 19:37:27 2011(r228477)
@@ -218,15 +218,34 @@
#endif
#endif
-
+/*
+ * Keywords added in C1X.
+ */
#if defined(__cplusplus) __cplusplus = 201103L
+#define_Alignof(e) alignof(e)
#define_Noreturn [[noreturn]]
+#define_Static_assert(e, s)static_assert(e, s)
+#define_Thread_local thread_local
#elif defined(__STDC_VERSION__) __STDC_VERSION__ 201000L
-/* Do nothing - _Noreturn is a keyword */
-#elif defined(__GNUC__)
+/* Do nothing. They are language keywords. */
+#else
+/* Not supported. Implement them manually. */
+#ifdef __GNUC__
+#define_Alignof(e) __alignof__(e)
#define_Noreturn __attribute__((__noreturn__))
+#define_Thread_local __thread
#else
+#define_Alignof(e) __offsetof(struct { char __a; e __b; },
__b)
#define_Noreturn
+#define_Thread_local
+#endif
+#ifdef __COUNTER__
+#define_Static_assert(e, s)__Static_assert(e, __COUNTER__)
+#else
+#define_Static_assert(e, s)__Static_assert(e, __LINE__)
+#endif
+#define__Static_assert(e, c) ___Static_assert(e, c)
+#define___Static_assert(e, c) typedef char __assert ## c[(e) ? 1 : -1]
#endif
#if __GNUC_PREREQ__(2, 96)
___
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: r228478 - head/sys/sys
Author: ed
Date: Tue Dec 13 19:39:24 2011
New Revision: 228478
URL: http://svn.freebsd.org/changeset/base/228478
Log:
Reimplement CTASSERT() using _Static_assert().
Modified:
head/sys/sys/systm.h
Modified: head/sys/sys/systm.h
==
--- head/sys/sys/systm.hTue Dec 13 19:37:27 2011(r228477)
+++ head/sys/sys/systm.hTue Dec 13 19:39:24 2011(r228478)
@@ -92,10 +92,8 @@ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUES
} while (0)
#endif
-#ifndef CTASSERT /* Allow lint to override */
-#defineCTASSERT(x) _CTASSERT(x, __LINE__)
-#define_CTASSERT(x, y) __CTASSERT(x, y)
-#define__CTASSERT(x, y)typedef char __assert ## y[(x) ? 1 : -1]
+#ifndef CTASSERT /* Allow lint to override */
+#defineCTASSERT(x) _Static_assert(x, compile-time assertion
failed)
#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: r228377 to r228473 top not working
On Tue, Dec 13, 2011 at 2:34 PM, Ivan Klymenko fi...@ukr.net wrote: Hi all! I have uname -a FreeBSD nonamehost 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r228473M: Tue Dec 13 20:09:45 EET 2011 ivan@nonamehost:/usr/obj/usr/src/sys/mk9 amd64 After update source code from r228377 to r228473 top stopped working # top top: sysctl(vm.stats.vm.v_active_count...) failed: No such file or directory # There are some ideas? Mea Culpa. I am currently testing a patch to fix this. Thanks! ___ svn-src-...@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 -- Eitan Adler ___ 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: r228478 - head/sys/sys
On Tue, 13 Dec 2011, Ed Schouten wrote:
Author: ed
Date: Tue Dec 13 19:39:24 2011
New Revision: 228478
URL: http://svn.freebsd.org/changeset/base/228478
Log:
Reimplement CTASSERT() using _Static_assert().
Cool, can we have a second variant with a custom error message?
Not having file:line and more information is freakingly unhelpful
often when compiling with -jhigh n and our current default compiler.
Modified:
head/sys/sys/systm.h
Modified: head/sys/sys/systm.h
==
--- head/sys/sys/systm.hTue Dec 13 19:37:27 2011(r228477)
+++ head/sys/sys/systm.hTue Dec 13 19:39:24 2011(r228478)
@@ -92,10 +92,8 @@ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUES
} while (0)
#endif
-#ifndef CTASSERT /* Allow lint to override */
-#defineCTASSERT(x) _CTASSERT(x, __LINE__)
-#define_CTASSERT(x, y) __CTASSERT(x, y)
-#define__CTASSERT(x, y)typedef char __assert ## y[(x) ? 1 : -1]
+#ifndef CTASSERT /* Allow lint to override */
+#defineCTASSERT(x) _Static_assert(x, compile-time assertion
failed)
#endif
/*
--
Bjoern A. Zeeb You have to have visions!
Stop bit received. Insert coin for new address family.
___
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: r228478 - head/sys/sys
* Bjoern A. Zeeb bzeeb-li...@lists.zabbadoz.net, 20111213 21:06: Cool, can we have a second variant with a custom error message? Yes; just use _Static_assert for that! It won't print the custom error message right now, but as soon as compilers implement C1X, it will work for you. -- Ed Schouten e...@80386.nl WWW: http://80386.nl/ pgpLMVLDfPelB.pgp Description: PGP signature
svn commit: r228479 - head/sys/dev/bge
Author: yongari
Date: Tue Dec 13 20:26:46 2011
New Revision: 228479
URL: http://svn.freebsd.org/changeset/base/228479
Log:
BCM5720 performance tweak from Broadcom.
o Allow multiple outstanding read requests from non-LSO read DMA engine.
o Allow 4KB burst length reads for non-LSO frames.
o Enable 512B burst length reads for buffer descriptors.
Submitted by: Geans Pin geanspin broadcom dot com
Modified:
head/sys/dev/bge/if_bge.c
head/sys/dev/bge/if_bgereg.h
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Tue Dec 13 19:39:24 2011(r228478)
+++ head/sys/dev/bge/if_bge.c Tue Dec 13 20:26:46 2011(r228479)
@@ -2080,9 +2080,15 @@ bge_blockinit(struct bge_softc *sc)
val |= BGE_RDMAMODE_TSO6_ENABLE;
}
- if (sc-bge_asicrev == BGE_ASICREV_BCM5720)
+ if (sc-bge_asicrev == BGE_ASICREV_BCM5720) {
val |= CSR_READ_4(sc, BGE_RDMA_MODE)
BGE_RDMAMODE_H2BNC_VLAN_DET;
+ /*
+* Allow multiple outstanding read requests from
+* non-LSO read DMA engine.
+*/
+ val = ~BGE_RDMAMODE_MULT_DMA_RD_DIS;
+ }
if (sc-bge_asicrev == BGE_ASICREV_BCM5761 ||
sc-bge_asicrev == BGE_ASICREV_BCM5784 ||
@@ -2112,12 +2118,20 @@ bge_blockinit(struct bge_softc *sc)
BGE_RDMA_RSRVCTRL_FIFO_OFLW_FIX);
}
- if (sc-bge_asicrev == BGE_ASICREV_BCM5719 ||
- sc-bge_asicrev == BGE_ASICREV_BCM5720) {
+ if (sc-bge_asicrev == BGE_ASICREV_BCM5719) {
CSR_WRITE_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL,
CSR_READ_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL) |
BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_4K |
BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_LSO_4K);
+ } else if (sc-bge_asicrev == BGE_ASICREV_BCM5720) {
+ /*
+* Allow 4KB burst length reads for non-LSO frames.
+* Enable 512B burst length reads for buffer descriptors.
+*/
+ CSR_WRITE_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL,
+ CSR_READ_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL) |
+ BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_512 |
+ BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_LSO_4K);
}
CSR_WRITE_4(sc, BGE_RDMA_MODE, val);
Modified: head/sys/dev/bge/if_bgereg.h
==
--- head/sys/dev/bge/if_bgereg.hTue Dec 13 19:39:24 2011
(r228478)
+++ head/sys/dev/bge/if_bgereg.hTue Dec 13 20:26:46 2011
(r228479)
@@ -1573,6 +1573,7 @@
#defineBGE_RDMA_RSRVCTRL_FIFO_HWM_MASK 0x000FF000
#defineBGE_RDMA_RSRVCTRL_TXMRGN_MASK 0xFFE0
+#defineBGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_5120x0002
#defineBGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_4K 0x0003
#defineBGE_RDMA_LSO_CRPTEN_CTRL_BLEN_LSO_4K0x000C
___
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: r228480 - head/sys/dev/bge
Author: yongari Date: Tue Dec 13 20:31:57 2011 New Revision: 228480 URL: http://svn.freebsd.org/changeset/base/228480 Log: Destroy DMA tag for jumbo RX buffer in device detach. Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c == --- head/sys/dev/bge/if_bge.c Tue Dec 13 20:26:46 2011(r228479) +++ head/sys/dev/bge/if_bge.c Tue Dec 13 20:31:57 2011(r228480) @@ -2358,6 +2358,8 @@ bge_dma_free(struct bge_softc *sc) if (sc-bge_cdata.bge_rx_mtag) bus_dma_tag_destroy(sc-bge_cdata.bge_rx_mtag); + if (sc-bge_cdata.bge_mtag_jumbo) + bus_dma_tag_destroy(sc-bge_cdata.bge_mtag_jumbo); if (sc-bge_cdata.bge_tx_mtag) bus_dma_tag_destroy(sc-bge_cdata.bge_tx_mtag); ___ 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: r228481 - in head: share/examples/scsi_target share/man/man4 sys/cam/scsi
Author: ed
Date: Tue Dec 13 21:26:33 2011
New Revision: 228481
URL: http://svn.freebsd.org/changeset/base/228481
Log:
Change targ(4) to use cdevpriv, instead of multiple character devices.
Also update the manpage and the scsi_target example program accordingly.
Discussed on: scsi@
Tested by:Chuck Tuffli chuck tuffli net
Modified:
head/share/examples/scsi_target/scsi_target.c
head/share/man/man4/targ.4
head/sys/cam/scsi/scsi_target.c
Modified: head/share/examples/scsi_target/scsi_target.c
==
--- head/share/examples/scsi_target/scsi_target.c Tue Dec 13 20:31:57
2011(r228480)
+++ head/share/examples/scsi_target/scsi_target.c Tue Dec 13 21:26:33
2011(r228481)
@@ -100,8 +100,8 @@ static void usage(void);
int
main(int argc, char *argv[])
{
- int ch, unit;
- char *file_name, targname[16];
+ int ch;
+ char *file_name;
u_int16_t req_flags, sim_flags;
off_t user_size;
@@ -283,17 +283,11 @@ main(int argc, char *argv[])
warnx(aio support tested ok);
}
- /* Go through all the control devices and find one that isn't busy. */
- unit = 0;
- do {
- snprintf(targname, sizeof(targname), /dev/targ%d, unit++);
- targ_fd = open(targname, O_RDWR);
- } while (targ_fd 0 errno == EBUSY);
-
+ targ_fd = open(/dev/targ, O_RDWR);
if (targ_fd 0)
- errx(1, Tried to open %d devices, none available, unit);
+ err(1, /dev/targ);
else
- warnx(opened %s, targname);
+ warnx(opened /dev/targ);
/* The first three are handled by kevent() later */
signal(SIGHUP, SIG_IGN);
Modified: head/share/man/man4/targ.4
==
--- head/share/man/man4/targ.4 Tue Dec 13 20:31:57 2011(r228480)
+++ head/share/man/man4/targ.4 Tue Dec 13 21:26:33 2011(r228481)
@@ -24,7 +24,7 @@
.\
.\ $FreeBSD$
.\
-.Dd November 15, 2002
+.Dd December 13, 2011
.Dt TARG 4
.Os
.Sh NAME
@@ -49,16 +49,8 @@ can be found in
.Pp
The
.Nm
-driver supplies control devices,
-.Pa /dev/targ0 ,
-.Pa /dev/targ1 ,
-etc.
-If a device is already in use,
-.Xr open 2
-will fail and
-.Va errno
-will be set to
-.Er EBUSY .
+driver supplies the control device
+.Pa /dev/targ .
After opening the device, the file descriptor must be bound to a
specific bus/target/LUN and enabled to process CCBs using the
.Dv TARGIOCENABLE
@@ -123,8 +115,8 @@ it.
describes the usermode interface.
.It Pa /sys/cam/scsi/scsi_target.c
is the driver source file.
-.It Pa /dev/targ*
-are the control devices.
+.It Pa /dev/targ
+is the control device.
.El
.Sh SEE ALSO
.Pa /usr/share/examples/scsi_target ,
Modified: head/sys/cam/scsi/scsi_target.c
==
--- head/sys/cam/scsi/scsi_target.c Tue Dec 13 20:31:57 2011
(r228480)
+++ head/sys/cam/scsi/scsi_target.c Tue Dec 13 21:26:33 2011
(r228481)
@@ -96,12 +96,9 @@ struct targ_softc {
targ_state state;
struct selinfo read_select;
struct devstat device_stats;
- struct callout destroy_dev_callout;
- struct mtx destroy_mtx;
};
static d_open_ttargopen;
-static d_close_t targclose;
static d_read_ttargread;
static d_write_t targwrite;
static d_ioctl_t targioctl;
@@ -119,7 +116,6 @@ static struct cdevsw targ_cdevsw = {
.d_version =D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = targopen,
- .d_close = targclose,
.d_read = targread,
.d_write = targwrite,
.d_ioctl = targioctl,
@@ -152,15 +148,12 @@ static void targfreeccb(struct targ_sof
static struct targ_cmd_descr *
targgetdescr(struct targ_softc *softc);
static periph_init_t targinit;
-static voidtargclone(void *arg, struct ucred *cred, char *name,
- int namelen, struct cdev **dev);
static voidtargasync(void *callback_arg, u_int32_t code,
struct cam_path *path, void *arg);
static voidabort_all_pending(struct targ_softc *softc);
static voidnotify_user(struct targ_softc *softc);
static int targcamstatus(cam_status status);
static size_t targccblen(xpt_opcode func_code);
-static voidtargdestroy(void *);
static struct periph_driver targdriver =
{
@@ -171,66 +164,18 @@ PERIPHDRIVER_DECLARE(targ, targdriver);
static MALLOC_DEFINE(M_TARG, TARG, TARG data);
-/*
- * Create softc and initialize it. Only one proc can open each targ device.
- * There is no locking here because a
svn commit: r228483 - in head/sys: arm/econa dev/usb dev/usb/controller mips/atheros mips/cavium/usb mips/rmi mips/rt305x modules/usb modules/usb/avr32dci powerpc/ps3
Author: hselasky
Date: Wed Dec 14 00:28:54 2011
New Revision: 228483
URL: http://svn.freebsd.org/changeset/base/228483
Log:
Implement better support for USB controller suspend and resume.
This patch should remove the need for kldunload of USB
controller drivers at suspend and kldload of USB controller
drivers at resume.
This patch also fixes some build issues in avr32dci.c
MFC after:2 weeks
Added:
head/sys/modules/usb/avr32dci/
head/sys/modules/usb/avr32dci/Makefile (contents, props changed)
Modified:
head/sys/arm/econa/ehci_ebus.c
head/sys/arm/econa/ohci_ec.c
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/at91dci.h
head/sys/dev/usb/controller/at91dci_atmelarm.c
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/atmegadci.h
head/sys/dev/usb/controller/atmegadci_atmelarm.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/avr32dci.h
head/sys/dev/usb/controller/ehci.c
head/sys/dev/usb/controller/ehci.h
head/sys/dev/usb/controller/ehci_ixp4xx.c
head/sys/dev/usb/controller/ehci_mv.c
head/sys/dev/usb/controller/ehci_pci.c
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/musb_otg.h
head/sys/dev/usb/controller/musb_otg_atmelarm.c
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/ohci.h
head/sys/dev/usb/controller/ohci_atmelarm.c
head/sys/dev/usb/controller/ohci_pci.c
head/sys/dev/usb/controller/ohci_s3c24x0.c
head/sys/dev/usb/controller/uhci.c
head/sys/dev/usb/controller/uhci.h
head/sys/dev/usb/controller/uhci_pci.c
head/sys/dev/usb/controller/usb_controller.c
head/sys/dev/usb/controller/uss820dci.c
head/sys/dev/usb/controller/uss820dci.h
head/sys/dev/usb/controller/uss820dci_atmelarm.c
head/sys/dev/usb/controller/xhci_pci.c
head/sys/dev/usb/usb_bus.h
head/sys/dev/usb/usb_controller.h
head/sys/dev/usb/usb_if.m
head/sys/mips/atheros/ar71xx_ehci.c
head/sys/mips/atheros/ar71xx_ohci.c
head/sys/mips/cavium/usb/octusb.c
head/sys/mips/cavium/usb/octusb.h
head/sys/mips/cavium/usb/octusb_octeon.c
head/sys/mips/rmi/xls_ehci.c
head/sys/mips/rt305x/rt305x_dotg.c
head/sys/modules/usb/Makefile
head/sys/powerpc/ps3/ehci_ps3.c
head/sys/powerpc/ps3/ohci_ps3.c
Modified: head/sys/arm/econa/ehci_ebus.c
==
--- head/sys/arm/econa/ehci_ebus.c Tue Dec 13 23:49:32 2011
(r228482)
+++ head/sys/arm/econa/ehci_ebus.c Wed Dec 14 00:28:54 2011
(r228483)
@@ -75,10 +75,6 @@ __FBSDID($FreeBSD$);
static device_attach_t ehci_ebus_attach;
static device_detach_t ehci_ebus_detach;
-static device_shutdown_t ehci_ebus_shutdown;
-static device_suspend_t ehci_ebus_suspend;
-static device_resume_t ehci_ebus_resume;
-
static void *ih_err;
@@ -86,45 +82,6 @@ static void *ih_err;
#defineUSB_BRIDGE_INTR_MASK 0x214
static int
-ehci_ebus_suspend(device_t self)
-{
- ehci_softc_t *sc = device_get_softc(self);
- int err;
-
- err = bus_generic_suspend(self);
- if (err)
- return (err);
- ehci_suspend(sc);
- return (0);
-}
-
-static int
-ehci_ebus_resume(device_t self)
-{
- ehci_softc_t *sc = device_get_softc(self);
-
- ehci_resume(sc);
-
- bus_generic_resume(self);
-
- return (0);
-}
-
-static int
-ehci_ebus_shutdown(device_t self)
-{
- ehci_softc_t *sc = device_get_softc(self);
- int err;
-
- err = bus_generic_shutdown(self);
- if (err)
- return (err);
- ehci_shutdown(sc);
-
- return (0);
-}
-
-static int
ehci_ebus_probe(device_t self)
{
@@ -277,17 +234,17 @@ static device_method_t ehci_methods[] =
DEVMETHOD(device_probe, ehci_ebus_probe),
DEVMETHOD(device_attach, ehci_ebus_attach),
DEVMETHOD(device_detach, ehci_ebus_detach),
- DEVMETHOD(device_suspend, ehci_ebus_suspend),
- DEVMETHOD(device_resume, ehci_ebus_resume),
- DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD_END
};
static driver_t ehci_driver = {
- ehci,
- ehci_methods,
- sizeof(ehci_softc_t),
+ .name = ehci,
+ .methods = ehci_methods,
+ .size = sizeof(ehci_softc_t),
};
static devclass_t ehci_devclass;
Modified: head/sys/arm/econa/ohci_ec.c
==
--- head/sys/arm/econa/ohci_ec.cTue Dec 13 23:49:32 2011
(r228482)
+++ head/sys/arm/econa/ohci_ec.cWed Dec 14 00:28:54 2011
(r228483)
@@ -220,15 +220,17 @@ static device_method_t ohci_methods[] =
DEVMETHOD(device_probe, ohci_ec_probe),
DEVMETHOD(device_attach, ohci_ec_attach),
DEVMETHOD(device_detach,
svn commit: r228484 - head/sys/dev/sound/usb
Author: hselasky
Date: Wed Dec 14 00:48:20 2011
New Revision: 228484
URL: http://svn.freebsd.org/changeset/base/228484
Log:
Stop USB audio transfers early so that any audio applications
will time out and close opened /dev/dspX.Y device(s), if
any. This is a workaround because we cannot unregister PCM
devices while the audio character device is in use.
Add a missing inclusion guard.
MFC after:1 weeks
Modified:
head/sys/dev/sound/usb/uaudio.c
head/sys/dev/sound/usb/uaudio.h
Modified: head/sys/dev/sound/usb/uaudio.c
==
--- head/sys/dev/sound/usb/uaudio.c Wed Dec 14 00:28:54 2011
(r228483)
+++ head/sys/dev/sound/usb/uaudio.c Wed Dec 14 00:48:20 2011
(r228484)
@@ -765,7 +765,15 @@ uaudio_detach(device_t dev)
{
struct uaudio_softc *sc = device_get_softc(dev);
- if (bus_generic_detach(dev)) {
+ /*
+* Stop USB transfers early so that any audio applications
+* will time out and close opened /dev/dspX.Y device(s), if
+* any.
+*/
+ uaudio_chan_stop(sc-sc_play_chan);
+ uaudio_chan_stop(sc-sc_rec_chan);
+
+ if (bus_generic_detach(dev) != 0) {
DPRINTF(detach failed!\n);
}
sbuf_delete(sc-sc_sndstat);
Modified: head/sys/dev/sound/usb/uaudio.h
==
--- head/sys/dev/sound/usb/uaudio.h Wed Dec 14 00:28:54 2011
(r228483)
+++ head/sys/dev/sound/usb/uaudio.h Wed Dec 14 00:48:20 2011
(r228484)
@@ -27,6 +27,9 @@
/* prototypes from uaudio.c used by uaudio_pcm.c */
+#ifndef _UAUDIO_H_
+#define_UAUDIO_H_
+
struct uaudio_chan;
struct uaudio_softc;
struct snd_dbuf;
@@ -63,3 +66,5 @@ extern uint32_t uaudio_mixer_setrecsrc(s
intuaudio_get_vendor(device_t dev);
intuaudio_get_product(device_t dev);
intuaudio_get_release(device_t dev);
+
+#endif /* _UAUDIO_H_ */
___
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: r228485 - head/sys/dev/sound/usb
Author: hselasky
Date: Wed Dec 14 01:03:07 2011
New Revision: 228485
URL: http://svn.freebsd.org/changeset/base/228485
Log:
Use usbd_transfer_unsetup() instead of usbd_transfer_stop() so that
we don't have to worry about locking.
MFC after:1 weeks
Modified:
head/sys/dev/sound/usb/uaudio.c
Modified: head/sys/dev/sound/usb/uaudio.c
==
--- head/sys/dev/sound/usb/uaudio.c Wed Dec 14 00:48:20 2011
(r228484)
+++ head/sys/dev/sound/usb/uaudio.c Wed Dec 14 01:03:07 2011
(r228485)
@@ -770,8 +770,10 @@ uaudio_detach(device_t dev)
* will time out and close opened /dev/dspX.Y device(s), if
* any.
*/
- uaudio_chan_stop(sc-sc_play_chan);
- uaudio_chan_stop(sc-sc_rec_chan);
+ if (sc-sc_play_chan.valid)
+ usbd_transfer_unsetup(sc-sc_play_chan.xfer, UAUDIO_NCHANBUFS);
+ if (sc-sc_rec_chan.valid)
+ usbd_transfer_unsetup(sc-sc_rec_chan.xfer, UAUDIO_NCHANBUFS);
if (bus_generic_detach(dev) != 0) {
DPRINTF(detach failed!\n);
___
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: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules
On 2011-Jun-28 11:57:25 +, Bjoern A. Zeeb b...@freebsd.org wrote: Author: bz Date: Tue Jun 28 11:57:25 2011 New Revision: 223637 URL: http://svn.freebsd.org/changeset/base/223637 Log: Update packet filter (pf) code to OpenBSD 4.5. This is very belated but I've just found the following preprocessor conditionals in sys/contrib/pf/net/pfvar.h as a result of this commit (covering lines 214..282): #ifdef __FreeBSD__ ... #ifdef __FreeBSD__ ... #else ... #endif /* __FreeBSD__ */ ... #endif /* __FreeBSD__ */ Was there a mismerge here? -- Peter Jeremy pgppOpwYJHEVh.pgp Description: PGP signature
svn commit: r228487 - head/sys/kern
Author: obrien Date: Wed Dec 14 02:31:32 2011 New Revision: 228487 URL: http://svn.freebsd.org/changeset/base/228487 Log: Match other formatting. Modified: head/sys/kern/kern_shutdown.c Modified: head/sys/kern/kern_shutdown.c == --- head/sys/kern/kern_shutdown.c Wed Dec 14 01:19:37 2011 (r228486) +++ head/sys/kern/kern_shutdown.c Wed Dec 14 02:31:32 2011 (r228487) @@ -103,8 +103,8 @@ int debugger_on_panic = 0; int debugger_on_panic = 1; #endif SYSCTL_INT(_debug, OID_AUTO, debugger_on_panic, -CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, debugger_on_panic, 0, -Run debugger on kernel panic); +CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, +debugger_on_panic, 0, Run debugger on kernel panic); TUNABLE_INT(debug.debugger_on_panic, debugger_on_panic); #ifdef KDB_TRACE @@ -113,8 +113,8 @@ static int trace_on_panic = 1; static int trace_on_panic = 0; #endif SYSCTL_INT(_debug, OID_AUTO, trace_on_panic, -CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, trace_on_panic, 0, -Print stack trace on kernel panic); +CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN, +trace_on_panic, 0, Print stack trace on kernel panic); TUNABLE_INT(debug.trace_on_panic, trace_on_panic); #endif /* KDB */ ___ 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: r228471 - in head/sys: boot/arm/at91/libat91 dev/cm dev/de dev/fdc dev/pccard dev/spibus dev/xen/netback pc98/cbus
On Tue, 13 Dec 2011, Stefan Farfeleder wrote: Log: Replace `inline static' by `static inline'. If I interpret the C standard correctly, the storage specifier should be placed before the inline keyword. While at it, replace __inline by inline in the files affected. No, declaration-specifier is defined recursively - any order is allowed. Still I think having a consistent order is a good idea. And using inline instead of __inline breaks C90 compilers. Unline const and signed, inline is new in C99, and there are still usable C90 compilers (e.g., c89, gcc -std=c89 and old(?) versions of TenDRA) which will break if it is spelled inline. C90 compilers should also break if it is spelled __inline, but it is easier to annul if is spelled __inline, and sys/cdefs.h already supports this. c89 and gcc -std=c89 apparently are not C compilers (even with -pedantic), since they accept __inline. They don't accept inline. The support in sys/cdefs.h for annuling __inline works automatically for TenDRA-4.20040902 -Ysystem (-Ysystem makes it use the system headers). When __inline is attached to static, annuling it doesn't change the semantics. Annuling it is not so safe for extern inline, but might work for at least individual source files. I mainly use TenDRA for its portability checks and better diagnostics of standards violations. Support for C90 in headers and no C99 code in the files being checked is enough for this. Bruce ___ 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: r228491 - head/sys/dev/cxgbe
Author: np Date: Wed Dec 14 05:34:23 2011 New Revision: 228491 URL: http://svn.freebsd.org/changeset/base/228491 Log: Do not clobber the ingress queue's congestion setting. MFC after:1 month Modified: head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/t4_sge.c == --- head/sys/dev/cxgbe/t4_sge.c Wed Dec 14 04:12:13 2011(r228490) +++ head/sys/dev/cxgbe/t4_sge.c Wed Dec 14 05:34:23 2011(r228491) @@ -1187,7 +1187,7 @@ alloc_iq_fl(struct port_info *pi, struct } fl-needed = fl-cap; - c.iqns_to_fl0congen = + c.iqns_to_fl0congen |= htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE) | F_FW_IQ_CMD_FL0FETCHRO | F_FW_IQ_CMD_FL0DATARO | F_FW_IQ_CMD_FL0PADEN); ___ 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
