svn commit: r270696 - stable/10/sys/amd64/include
Author: grehan
Date: Wed Aug 27 06:13:44 2014
New Revision: 270696
URL: http://svnweb.freebsd.org/changeset/base/270696
Log:
MFC 270438
Change __inline style to be consistent with FreeBSD usage,
and also fix gcc build.
PR: 192880
Modified:
stable/10/sys/amd64/include/vmm.h
Modified: stable/10/sys/amd64/include/vmm.h
==
--- stable/10/sys/amd64/include/vmm.h Wed Aug 27 01:38:26 2014
(r270695)
+++ stable/10/sys/amd64/include/vmm.h Wed Aug 27 06:13:44 2014
(r270696)
@@ -587,25 +587,25 @@ struct vm_exit {
void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid,
int errcode);
-static void __inline
+static __inline void
vm_inject_ud(void *vm, int vcpuid)
{
vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0);
}
-static void __inline
+static __inline void
vm_inject_gp(void *vm, int vcpuid)
{
vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0);
}
-static void __inline
+static __inline void
vm_inject_ac(void *vm, int vcpuid, int errcode)
{
vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode);
}
-static void __inline
+static __inline void
vm_inject_ss(void *vm, int vcpuid, int errcode)
{
vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270698 - in head: etc share/man/man5
Author: hrs
Date: Wed Aug 27 09:19:22 2014
New Revision: 270698
URL: http://svnweb.freebsd.org/changeset/base/270698
Log:
- Use $local_startup to load rc.conf.d/* scripts.
- Document support of rc.conf.d/dir/* introduced in r270392.
Discussed with: bapt
Modified:
head/etc/rc.subr
head/share/man/man5/rc.conf.5
Modified: head/etc/rc.subr
==
--- head/etc/rc.subrWed Aug 27 08:05:57 2014(r270697)
+++ head/etc/rc.subrWed Aug 27 09:19:22 2014(r270698)
@@ -1270,7 +1270,7 @@ run_rc_script()
#
load_rc_config()
{
- local _name _rcvar_val _var _defval _v _msg _new
+ local _name _rcvar_val _var _defval _v _msg _new _d
_name=$1
if [ -z $_name ]; then
err 3 'USAGE: load_rc_config name'
@@ -1289,22 +1289,21 @@ load_rc_config()
fi
_rc_conf_loaded=true
fi
- if [ -f /etc/rc.conf.d/$_name ]; then
- debug Sourcing /etc/rc.conf.d/$_name
- . /etc/rc.conf.d/$_name
- elif [ -d /etc/rc.conf.d/$_name ] ; then
- local _rc
- for _rc in /etc/rc.conf.d/$_name/* ; do
- if [ -f $_rc ] ; then
- debug Sourcing $_rc
- . $_rc
- fi
- done
- fi
- if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/$_name ]; then
- debug Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}
- . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/$_name
- fi
+
+ for _d in /etc ${local_startup%*/rc.d}; do
+ if [ -f ${_d}/rc.conf.d/$_name ]; then
+ debug Sourcing ${_d}/rc.conf.d/$_name
+ . ${_d}/rc.conf.d/$_name
+ elif [ -d ${_d}/rc.conf.d/$_name ] ; then
+ local _rc
+ for _rc in ${_d}/rc.conf.d/$_name/* ; do
+ if [ -f $_rc ] ; then
+ debug Sourcing $_rc
+ . $_rc
+ fi
+ done
+ fi
+ done
# Set defaults if defined.
for _var in $rcvar; do
Modified: head/share/man/man5/rc.conf.5
==
--- head/share/man/man5/rc.conf.5 Wed Aug 27 08:05:57 2014
(r270697)
+++ head/share/man/man5/rc.conf.5 Wed Aug 27 09:19:22 2014
(r270698)
@@ -63,20 +63,37 @@ The file
is used to override settings in
.Pa /etc/rc.conf
for historical reasons.
+.Pp
In addition to
.Pa /etc/rc.conf.local
you can also place smaller configuration files for each
.Xr rc 8
script in the
.Pa /etc/rc.conf.d
-directory or in the
-.Pa ${LOCALBASE}/etc/rc.conf.d
-directory, which will be included by the
+directory or
+.Ao Ar dir Ac Ns Pa /rc.conf.d
+directories specified in
+.Va local_startup ,
+which will be included by the
.Va load_rc_config
function.
For jail configurations you could use the file
.Pa /etc/rc.conf.d/jail
to store jail specific configuration options.
+If
+.Va local_startup
+contains
+.Pa /usr/local/etc/rc.d
+and
+.Pa /opt/conf ,
+.Pa /usr/local/rc.conf.d/jail
+and
+.Pa /opt/conf/rc.conf.d/jail
+will be loaded.
+If
+.Ao Ar dir Ac Ns Pa /rc.conf.d/ Ns Ao Ar name Ac
+is a directory,
+all of files in the directory will be loaded.
Also see the
.Va rc_conf_files
variable below.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270702 - head/sys/dev/vt
Author: dumbbell
Date: Wed Aug 27 09:34:41 2014
New Revision: 270702
URL: http://svnweb.freebsd.org/changeset/base/270702
Log:
vt(4): Implement basic support for KDSETMODE ioctl
With the current implementation, this allows an X11 server to tell
the console it switches a particular window in graphics mode. This
information is used by the mouse handling code to ignore sysmouse events
in the window taken by the X server: only him should receive those
events.
Reported by: flo@, glebius@, kan@
Tested by:flo@
Reviewed by: kan@
MFC after:1 week
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hWed Aug 27 09:26:33 2014(r270701)
+++ head/sys/dev/vt/vt.hWed Aug 27 09:34:41 2014(r270702)
@@ -271,6 +271,7 @@ struct vt_window {
#defineVWF_VTYLOCK 0x10/* Prevent window switch. */
#defineVWF_MOUSE_HIDE 0x20/* Disable mouse events processing. */
#defineVWF_READY 0x40/* Window fully initialized. */
+#defineVWF_GRAPHICS0x80/* Window in graphics mode (KDSETMODE).
*/
#defineVWF_SWWAIT_REL 0x1 /* Program wait for VT acquire is done.
*/
#defineVWF_SWWAIT_ACQ 0x2 /* Program wait for VT release is done.
*/
pid_tvw_pid;/* Terminal holding process */
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Wed Aug 27 09:26:33 2014(r270701)
+++ head/sys/dev/vt/vt_core.c Wed Aug 27 09:34:41 2014(r270702)
@@ -1476,8 +1476,13 @@ vt_mouse_event(int type, int x, int y, i
vf = vw-vw_font;
mark = 0;
- if (vw-vw_flags VWF_MOUSE_HIDE)
- return; /* Mouse disabled. */
+ if (vw-vw_flags (VWF_MOUSE_HIDE | VWF_GRAPHICS))
+ /*
+* Either the mouse is disabled, or the window is in
+* graphics mode. The graphics mode is usually set by
+* an X server, using the KDSETMODE ioctl.
+*/
+ return;
if (vf == NULL) /* Text mode. */
return;
@@ -1509,7 +1514,7 @@ vt_mouse_event(int type, int x, int y, i
vd-vd_my = y;
if ((vd-vd_mstate MOUSE_BUTTON1DOWN)
(vtbuf_set_mark(vw-vw_buf, VTB_MARK_MOVE,
- vd-vd_mx / vf-vf_width,
+ vd-vd_mx / vf-vf_width,
vd-vd_my / vf-vf_height) == 1)) {
/*
@@ -1854,7 +1859,20 @@ skip_thunk:
return (0);
}
case KDSETMODE:
- /* XXX */
+ /*
+* FIXME: This implementation is incomplete compared to
+* syscons.
+*/
+ switch (*(int *)data) {
+ case KD_TEXT:
+ case KD_TEXT1:
+ case KD_PIXEL:
+ vw-vw_flags = ~VWF_GRAPHICS;
+ break;
+ case KD_GRAPHICS:
+ vw-vw_flags |= VWF_GRAPHICS;
+ break;
+ }
return (0);
case KDENABIO: /* allow io operations */
error = priv_check(td, PRIV_IO);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270705 - in head/sys: dev/vt kern sys
Author: dumbbell
Date: Wed Aug 27 10:04:10 2014
New Revision: 270705
URL: http://svnweb.freebsd.org/changeset/base/270705
Log:
vt(4): Add cngrab() and cnungrab() callbacks
They are used when a panic occurs or when entering a DDB session for
instance.
cngrab() forces a vt-switch to the console window, no matter if the
original window is another terminal or an X session. However, cnungrab()
doesn't vt-switch back to the original window currently.
MFC after:1 week
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
head/sys/kern/subr_terminal.c
head/sys/sys/terminal.h
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hWed Aug 27 09:57:27 2014(r270704)
+++ head/sys/dev/vt/vt.hWed Aug 27 10:04:10 2014(r270705)
@@ -261,6 +261,8 @@ struct vt_window {
term_rect_t vw_draw_area; /* (?) Drawable area. */
unsigned int vw_number; /* (c) Window number. */
int vw_kbdmode;/* (?) Keyboard mode. */
+ int vw_prev_kbdmode;/* (?) Previous mode. */
+ int vw_grabbed;/* (?) Grab count. */
char*vw_kbdsq; /* Escape sequence queue*/
unsigned int vw_flags; /* (d) Per-window flags. */
int vw_mouse_level;/* Mouse op mode. */
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Wed Aug 27 09:57:27 2014(r270704)
+++ head/sys/dev/vt/vt_core.c Wed Aug 27 10:04:10 2014(r270705)
@@ -70,6 +70,9 @@ static tc_done_t vtterm_done;
static tc_cnprobe_tvtterm_cnprobe;
static tc_cngetc_t vtterm_cngetc;
+static tc_cngrab_t vtterm_cngrab;
+static tc_cnungrab_t vtterm_cnungrab;
+
static tc_opened_t vtterm_opened;
static tc_ioctl_t vtterm_ioctl;
static tc_mmap_t vtterm_mmap;
@@ -86,6 +89,9 @@ const struct terminal_class vt_termclass
.tc_cnprobe = vtterm_cnprobe,
.tc_cngetc = vtterm_cngetc,
+ .tc_cngrab = vtterm_cngrab,
+ .tc_cnungrab= vtterm_cnungrab,
+
.tc_opened = vtterm_opened,
.tc_ioctl = vtterm_ioctl,
.tc_mmap= vtterm_mmap,
@@ -191,6 +197,7 @@ static struct vt_window vt_conswindow =
.vw_device = vt_consdev,
.vw_terminal = vt_consterm,
.vw_kbdmode = K_XLATE,
+ .vw_grabbed = 0,
};
static struct terminal vt_consterm = {
.tm_class = vt_termclass,
@@ -1202,6 +1209,64 @@ vtterm_cngetc(struct terminal *tm)
}
static void
+vtterm_cngrab(struct terminal *tm)
+{
+ struct vt_device *vd;
+ struct vt_window *vw;
+ keyboard_t *kbd;
+
+ vw = tm-tm_softc;
+ vd = vw-vw_device;
+
+ if (!cold)
+ vt_window_switch(vw);
+
+ kbd = kbd_get_keyboard(vd-vd_keyboard);
+ if (kbd == NULL)
+ return;
+
+ if (vw-vw_grabbed++ 0)
+ return;
+
+ /*
+* Make sure the keyboard is accessible even when the kbd device
+* driver is disabled.
+*/
+ kbdd_enable(kbd);
+
+ /* We shall always use the keyboard in the XLATE mode here. */
+ vw-vw_prev_kbdmode = vw-vw_kbdmode;
+ vw-vw_kbdmode = K_XLATE;
+ (void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)vw-vw_kbdmode);
+
+ kbdd_poll(kbd, TRUE);
+}
+
+static void
+vtterm_cnungrab(struct terminal *tm)
+{
+ struct vt_device *vd;
+ struct vt_window *vw;
+ keyboard_t *kbd;
+
+ vw = tm-tm_softc;
+ vd = vw-vw_device;
+
+ kbd = kbd_get_keyboard(vd-vd_keyboard);
+ if (kbd == NULL)
+ return;
+
+ if (--vw-vw_grabbed 0)
+ return;
+
+ kbdd_poll(kbd, FALSE);
+
+ vw-vw_kbdmode = vw-vw_prev_kbdmode;
+ (void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)vw-vw_kbdmode);
+ kbdd_disable(kbd);
+}
+
+static void
vtterm_opened(struct terminal *tm, int opened)
{
struct vt_window *vw = tm-tm_softc;
Modified: head/sys/kern/subr_terminal.c
==
--- head/sys/kern/subr_terminal.c Wed Aug 27 09:57:27 2014
(r270704)
+++ head/sys/kern/subr_terminal.c Wed Aug 27 10:04:10 2014
(r270705)
@@ -476,13 +476,17 @@ termcn_cnregister(struct terminal *tm)
static void
termcn_cngrab(struct consdev *cp)
{
+ struct terminal *tm = cp-cn_arg;
+ tm-tm_class-tc_cngrab(tm);
}
static void
termcn_cnungrab(struct consdev *cp)
{
+ struct terminal *tm = cp-cn_arg;
+ tm-tm_class-tc_cnungrab(tm);
}
static void
Modified: head/sys/sys/terminal.h
==
--- head/sys/sys/terminal.h
svn commit: r270706 - head/sys/dev/drm2
Author: dumbbell
Date: Wed Aug 27 10:07:08 2014
New Revision: 270706
URL: http://svnweb.freebsd.org/changeset/base/270706
Log:
drm: Don't taskqueue vt-switch if under DDB/panic situation
If DDB is active, we can't use a taskqueue thread to switch away from
the X window, because this thread can't run.
Reviewed by: ray@
Approved by: ray@
MFC after:1 week
Modified:
head/sys/dev/drm2/drm_fb_helper.c
Modified: head/sys/dev/drm2/drm_fb_helper.c
==
--- head/sys/dev/drm2/drm_fb_helper.c Wed Aug 27 10:04:10 2014
(r270705)
+++ head/sys/dev/drm2/drm_fb_helper.c Wed Aug 27 10:07:08 2014
(r270706)
@@ -36,6 +36,8 @@ __FBSDID($FreeBSD$);
#include dev/drm2/drm_fb_helper.h
#include dev/drm2/drm_crtc_helper.h
+#include sys/kdb.h
+
struct vt_kms_softc {
struct drm_fb_helper *fb_helper;
struct task fb_mode_task;
@@ -64,7 +66,11 @@ vt_kms_postswitch(void *arg)
struct vt_kms_softc *sc;
sc = (struct vt_kms_softc *)arg;
- taskqueue_enqueue_fast(taskqueue_thread, sc-fb_mode_task);
+
+ if (!kdb_active panicstr == NULL)
+ taskqueue_enqueue_fast(taskqueue_thread, sc-fb_mode_task);
+ else
+ drm_fb_helper_restore_fbdev_mode(sc-fb_helper);
return (0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270705 - in head/sys: dev/vt kern sys
On 27.08.2014 12:04, Jean-Sebastien Pedron wrote: Author: dumbbell Date: Wed Aug 27 10:04:10 2014 New Revision: 270705 URL: http://svnweb.freebsd.org/changeset/base/270705 Log: vt(4): Add cngrab() and cnungrab() callbacks Review: https://reviews.freebsd.org/D682 Reviewed by:ray@ Approved by:ray@ -- Jean-Sébastien Pédron ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270702 - head/sys/dev/vt
On Wed, Aug 27, 2014 at 09:34:41AM +, Jean-Sebastien Pedron wrote: J Author: dumbbell J Date: Wed Aug 27 09:34:41 2014 J New Revision: 270702 J URL: http://svnweb.freebsd.org/changeset/base/270702 J J Log: J vt(4): Implement basic support for KDSETMODE ioctl J J With the current implementation, this allows an X11 server to tell J the console it switches a particular window in graphics mode. This J information is used by the mouse handling code to ignore sysmouse events J in the window taken by the X server: only him should receive those J events. J J Reported by: flo@, glebius@, kan@ J Tested by: flo@ J Reviewed by: kan@ J MFC after: 1 week Thanks a lot! Works okay. -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270707 - head/sys/dev/vt
Author: dumbbell
Date: Wed Aug 27 11:08:09 2014
New Revision: 270707
URL: http://svnweb.freebsd.org/changeset/base/270707
Log:
vt(4): Pause the vt_flush() timer when the screen is up-to-date
The timer is restarted whenever a window buffer is marked as dirty or
the mouse cursor moves.
There's still room for improvement. For instance, we should not mark a
window buffer as dirty when this window isn't displayed.
Review: https://reviews.freebsd.org/D683
Reviewed by: ray@
Approved by: ray@
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Wed Aug 27 10:07:08 2014(r270706)
+++ head/sys/dev/vt/vt_core.c Wed Aug 27 11:08:09 2014(r270707)
@@ -255,7 +255,8 @@ static void
vt_resume_flush_timer(struct vt_device *vd, int ms)
{
- if (!atomic_cmpset_int(vd-vd_timer_armed, 0, 1))
+ if (!(vd-vd_flags VDF_ASYNC) ||
+ !atomic_cmpset_int(vd-vd_timer_armed, 0, 1))
return;
vt_schedule_flush(vd, ms);
@@ -265,7 +266,8 @@ static void
vt_suspend_flush_timer(struct vt_device *vd)
{
- if (!atomic_cmpset_int(vd-vd_timer_armed, 1, 0))
+ if (!(vd-vd_flags VDF_ASYNC) ||
+ !atomic_cmpset_int(vd-vd_timer_armed, 1, 0))
return;
callout_drain(vd-vd_timer);
@@ -467,9 +469,11 @@ vt_scroll(struct vt_window *vw, int offs
if (diff -size.tp_row || diff size.tp_row) {
vw-vw_device-vd_flags |= VDF_INVALID;
+ vt_resume_flush_timer(vw-vw_device, 0);
return;
}
vw-vw_device-vd_flags |= VDF_INVALID; /*XXX*/
+ vt_resume_flush_timer(vw-vw_device, 0);
}
static int
@@ -782,6 +786,7 @@ vtterm_cursor(struct terminal *tm, const
struct vt_window *vw = tm-tm_softc;
vtbuf_cursor_position(vw-vw_buf, p);
+ vt_resume_flush_timer(vw-vw_device, 0);
}
static void
@@ -790,6 +795,7 @@ vtterm_putchar(struct terminal *tm, cons
struct vt_window *vw = tm-tm_softc;
vtbuf_putchar(vw-vw_buf, p, c);
+ vt_resume_flush_timer(vw-vw_device, 0);
}
static void
@@ -798,6 +804,7 @@ vtterm_fill(struct terminal *tm, const t
struct vt_window *vw = tm-tm_softc;
vtbuf_fill_locked(vw-vw_buf, r, c);
+ vt_resume_flush_timer(vw-vw_device, 0);
}
static void
@@ -807,6 +814,7 @@ vtterm_copy(struct terminal *tm, const t
struct vt_window *vw = tm-tm_softc;
vtbuf_copy(vw-vw_buf, r, p);
+ vt_resume_flush_timer(vw-vw_device, 0);
}
static void
@@ -817,6 +825,7 @@ vtterm_param(struct terminal *tm, int cm
switch (cmd) {
case TP_SHOWCURSOR:
vtbuf_cursor_visibility(vw-vw_buf, arg);
+ vt_resume_flush_timer(vw-vw_device, 0);
break;
case TP_MOUSE:
vw-vw_mouse_level = arg;
@@ -915,7 +924,7 @@ vt_mark_mouse_position_as_dirty(struct v
}
#endif
-static void
+static int
vt_flush(struct vt_device *vd)
{
struct vt_window *vw;
@@ -929,14 +938,14 @@ vt_flush(struct vt_device *vd)
vw = vd-vd_curwindow;
if (vw == NULL)
- return;
+ return (0);
if (vd-vd_flags VDF_SPLASH || vw-vw_flags VWF_BUSY)
- return;
+ return (0);
vf = vw-vw_font;
if (((vd-vd_flags VDF_TEXTMODE) == 0) (vf == NULL))
- return;
+ return (0);
#ifndef SC_NO_CUTPASTE
cursor_was_shown = vd-vd_mshown;
@@ -990,20 +999,27 @@ vt_flush(struct vt_device *vd)
if (tarea.tr_begin.tp_col tarea.tr_end.tp_col) {
vd-vd_driver-vd_bitblt_text(vd, vw, tarea);
+ return (1);
}
+
+ return (0);
}
static void
vt_timer(void *arg)
{
struct vt_device *vd;
+ int changed;
vd = arg;
/* Update screen if required. */
- vt_flush(vd);
+ changed = vt_flush(vd);
/* Schedule for next update. */
- vt_schedule_flush(vd, 0);
+ if (changed)
+ vt_schedule_flush(vd, 0);
+ else
+ vd-vd_timer_armed = 0;
}
static void
@@ -1372,6 +1388,7 @@ vt_change_font(struct vt_window *vw, str
if (vd-vd_curwindow == vw) {
vt_set_border(vw, vf, TC_BLACK);
vd-vd_flags |= VDF_INVALID;
+ vt_resume_flush_timer(vw-vw_device, 0);
}
vw-vw_flags = ~VWF_BUSY;
VT_UNLOCK(vd);
@@ -1588,6 +1605,8 @@ vt_mouse_event(int type, int x, int y, i
*/
vd-vd_markedwin = vw;
}
+
+ vt_resume_flush_timer(vw-vw_device, 0);
return; /* Done */
case MOUSE_BUTTON_EVENT:
/* Buttons */
@@ -1672,6 +1691,7 @@ vt_mouse_event(int type, int x, int
svn commit: r270708 - head/sys/dev/vt
Author: dumbbell
Date: Wed Aug 27 11:27:48 2014
New Revision: 270708
URL: http://svnweb.freebsd.org/changeset/base/270708
Log:
vt(4): Recompute the drawable area when the resolution changes
This was only done when the font changed.
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Wed Aug 27 11:08:09 2014(r270707)
+++ head/sys/dev/vt/vt_core.c Wed Aug 27 11:27:48 2014(r270708)
@@ -2269,12 +2269,11 @@ vt_resize(struct vt_device *vd)
vw = vd-vd_windows[i];
VT_LOCK(vd);
/* Assign default font to window, if not textmode. */
- if (!(vd-vd_flags VDF_TEXTMODE) vw-vw_font == NULL) {
+ if (!(vd-vd_flags VDF_TEXTMODE) vw-vw_font == NULL)
vw-vw_font = vtfont_ref(vt_font_default);
- vt_compute_drawable_area(vw);
- }
VT_UNLOCK(vd);
/* Resize terminal windows */
+ vt_compute_drawable_area(vw);
while (vt_change_font(vw, vw-vw_font) == EBUSY) {
DPRINTF(100, %s: vt_change_font() is busy,
window %d\n, __func__, i);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver...
Author: hselasky Date: Wed Aug 27 13:21:53 2014 New Revision: 270710 URL: http://svnweb.freebsd.org/changeset/base/270710 Log: - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. - Remove empty files from the OFED Linux Emulation layer. - Fix compile warnings related to printf() and the %lld and %llx format specifiers. - Add some missing 2-clause BSD copyrights. - Add Mellanox Technologies, Ltd. to list of copyright holders. - Add some new compatibility files. - Fix order of uninit in the mlx4ib module to avoid crash at unload using the new module_exit_order() function. MFC after:1 week Sponsored by: Mellanox Technologies Added: head/sys/ofed/include/linux/cache.h (contents, props changed) head/sys/ofed/include/linux/etherdevice.h (contents, props changed) head/sys/ofed/include/linux/kmod.h (contents, props changed) head/sys/ofed/include/linux/ktime.h (contents, props changed) head/sys/ofed/include/linux/math64.h (contents, props changed) head/sys/ofed/include/net/if_inet6.h (contents, props changed) Deleted: head/sys/ofed/include/asm/current.h head/sys/ofed/include/asm/semaphore.h head/sys/ofed/include/asm/system.h head/sys/ofed/include/linux/atomic.h head/sys/ofed/include/linux/bitmap.h head/sys/ofed/include/linux/ctype.h head/sys/ofed/include/linux/init.h head/sys/ofed/include/linux/rtnetlink.h head/sys/ofed/include/linux/stddef.h head/sys/ofed/include/net/addrconf.h head/sys/ofed/include/net/arp.h head/sys/ofed/include/net/ip6_route.h head/sys/ofed/include/net/neighbour.h Modified: head/sys/contrib/rdma/krping/krping.c head/sys/dev/cxgb/cxgb_osdep.h head/sys/dev/cxgbe/iw_cxgbe/cm.c head/sys/dev/cxgbe/iw_cxgbe/qp.c head/sys/modules/mlx4/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlxen/Makefile head/sys/ofed/drivers/infiniband/core/addr.c head/sys/ofed/drivers/infiniband/core/cm.c head/sys/ofed/drivers/infiniband/core/device.c head/sys/ofed/drivers/infiniband/core/iwcm.c head/sys/ofed/drivers/infiniband/core/sa_query.c head/sys/ofed/drivers/infiniband/core/sysfs.c head/sys/ofed/drivers/infiniband/core/ucm.c head/sys/ofed/drivers/infiniband/core/user_mad.c head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c head/sys/ofed/drivers/infiniband/core/uverbs_main.c head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c head/sys/ofed/drivers/infiniband/hw/mlx4/main.c head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c head/sys/ofed/drivers/net/mlx4/alloc.c head/sys/ofed/drivers/net/mlx4/cmd.c head/sys/ofed/drivers/net/mlx4/cq.c head/sys/ofed/drivers/net/mlx4/en_netdev.c head/sys/ofed/drivers/net/mlx4/en_rx.c head/sys/ofed/drivers/net/mlx4/eq.c head/sys/ofed/drivers/net/mlx4/fw.c head/sys/ofed/drivers/net/mlx4/main.c head/sys/ofed/drivers/net/mlx4/mcg.c head/sys/ofed/drivers/net/mlx4/mr.c head/sys/ofed/drivers/net/mlx4/pd.c head/sys/ofed/drivers/net/mlx4/qp.c head/sys/ofed/drivers/net/mlx4/reset.c head/sys/ofed/drivers/net/mlx4/resource_tracker.c head/sys/ofed/drivers/net/mlx4/sense.c head/sys/ofed/drivers/net/mlx4/srq.c head/sys/ofed/drivers/net/mlx4/xrcd.c head/sys/ofed/include/asm/atomic-long.h head/sys/ofed/include/asm/atomic.h head/sys/ofed/include/asm/byteorder.h head/sys/ofed/include/asm/fcntl.h head/sys/ofed/include/asm/io.h head/sys/ofed/include/asm/page.h head/sys/ofed/include/asm/pgtable.h head/sys/ofed/include/asm/types.h head/sys/ofed/include/asm/uaccess.h head/sys/ofed/include/linux/bitops.h head/sys/ofed/include/linux/cdev.h head/sys/ofed/include/linux/clocksource.h head/sys/ofed/include/linux/compat.h head/sys/ofed/include/linux/compiler.h head/sys/ofed/include/linux/completion.h head/sys/ofed/include/linux/delay.h head/sys/ofed/include/linux/device.h head/sys/ofed/include/linux/dma-attrs.h head/sys/ofed/include/linux/dma-mapping.h head/sys/ofed/include/linux/dmapool.h head/sys/ofed/include/linux/err.h head/sys/ofed/include/linux/errno.h head/sys/ofed/include/linux/ethtool.h head/sys/ofed/include/linux/file.h head/sys/ofed/include/linux/fs.h head/sys/ofed/include/linux/gfp.h head/sys/ofed/include/linux/hardirq.h head/sys/ofed/include/linux/idr.h head/sys/ofed/include/linux/if_arp.h head/sys/ofed/include/linux/if_ether.h head/sys/ofed/include/linux/if_vlan.h
svn commit: r270711 - stable/10/sys/netinet/cc
Author: hselasky
Date: Wed Aug 27 14:07:24 2014
New Revision: 270711
URL: http://svnweb.freebsd.org/changeset/base/270711
Log:
MFC r269777:
Fix string length argument passed to sysctl_handle_string() so that
the complete string is returned by the function and not just only one
byte.
PR: 192544
Modified:
stable/10/sys/netinet/cc/cc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/cc/cc.c
==
--- stable/10/sys/netinet/cc/cc.c Wed Aug 27 13:21:53 2014
(r270710)
+++ stable/10/sys/netinet/cc/cc.c Wed Aug 27 14:07:24 2014
(r270711)
@@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS)
CC_LIST_RLOCK();
strlcpy(default_cc, CC_DEFAULT()-name, TCP_CA_NAME_MAX);
CC_LIST_RUNLOCK();
- err = sysctl_handle_string(oidp, default_cc, 1, req);
+ err = sysctl_handle_string(oidp, default_cc, 0, req);
} else {
/* Find algo with specified name and set it to default. */
CC_LIST_RLOCK();
@@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS)
if (!err) {
sbuf_finish(s);
- err = sysctl_handle_string(oidp, sbuf_data(s), 1, req);
+ err = sysctl_handle_string(oidp, sbuf_data(s), 0, req);
}
sbuf_delete(s);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
On Tue, Aug 26, 2014 at 02:31:37AM +, Andrew Thompson wrote: In zfs directory layout you missing some separate datesets: usr/home (or, may be, just /home) usr/obj usr/ports/packages usr/ports/distfiles Can you do it before 10.1? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270712 - stable/9/sys/netinet/cc
Author: hselasky
Date: Wed Aug 27 14:11:25 2014
New Revision: 270712
URL: http://svnweb.freebsd.org/changeset/base/270712
Log:
MFC r269777:
Fix string length argument passed to sysctl_handle_string() so that
the complete string is returned by the function and not just only one
byte.
PR: 192544
Modified:
stable/9/sys/netinet/cc/cc.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/cc/cc.c
==
--- stable/9/sys/netinet/cc/cc.cWed Aug 27 14:07:24 2014
(r270711)
+++ stable/9/sys/netinet/cc/cc.cWed Aug 27 14:11:25 2014
(r270712)
@@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS)
CC_LIST_RLOCK();
strlcpy(default_cc, CC_DEFAULT()-name, TCP_CA_NAME_MAX);
CC_LIST_RUNLOCK();
- err = sysctl_handle_string(oidp, default_cc, 1, req);
+ err = sysctl_handle_string(oidp, default_cc, 0, req);
} else {
/* Find algo with specified name and set it to default. */
CC_LIST_RLOCK();
@@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS)
if (!err) {
sbuf_finish(s);
- err = sysctl_handle_string(oidp, sbuf_data(s), 1, req);
+ err = sysctl_handle_string(oidp, sbuf_data(s), 0, req);
}
sbuf_delete(s);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270713 - stable/8/sys/netinet/cc
Author: hselasky
Date: Wed Aug 27 14:13:47 2014
New Revision: 270713
URL: http://svnweb.freebsd.org/changeset/base/270713
Log:
MFC r269777:
Fix string length argument passed to sysctl_handle_string() so that
the complete string is returned by the function and not just only one
byte.
PR: 192544
Modified:
stable/8/sys/netinet/cc/cc.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/netinet/cc/cc.c
==
--- stable/8/sys/netinet/cc/cc.cWed Aug 27 14:11:25 2014
(r270712)
+++ stable/8/sys/netinet/cc/cc.cWed Aug 27 14:13:47 2014
(r270713)
@@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS)
CC_LIST_RLOCK();
strlcpy(default_cc, CC_DEFAULT()-name, TCP_CA_NAME_MAX);
CC_LIST_RUNLOCK();
- err = sysctl_handle_string(oidp, default_cc, 1, req);
+ err = sysctl_handle_string(oidp, default_cc, 0, req);
} else {
/* Find algo with specified name and set it to default. */
CC_LIST_RLOCK();
@@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS)
if (!err) {
sbuf_finish(s);
- err = sysctl_handle_string(oidp, sbuf_data(s), 1, req);
+ err = sysctl_handle_string(oidp, sbuf_data(s), 0, req);
}
sbuf_delete(s);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270714 - stable/10/lib/libusb
Author: hselasky
Date: Wed Aug 27 14:17:15 2014
New Revision: 270714
URL: http://svnweb.freebsd.org/changeset/base/270714
Log:
MFC r270133:
Add more USB class codes.
Modified:
stable/10/lib/libusb/libusb.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libusb/libusb.h
==
--- stable/10/lib/libusb/libusb.h Wed Aug 27 14:13:47 2014
(r270713)
+++ stable/10/lib/libusb/libusb.h Wed Aug 27 14:17:15 2014
(r270714)
@@ -51,10 +51,18 @@ enum libusb_class_code {
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
LIBUSB_CLASS_PTP = 6,
+ LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
LIBUSB_CLASS_MASS_STORAGE = 8,
LIBUSB_CLASS_HUB = 9,
LIBUSB_CLASS_DATA = 10,
+ LIBUSB_CLASS_SMART_CARD = 11,
+ LIBUSB_CLASS_CONTENT_SECURITY = 13,
+ LIBUSB_CLASS_VIDEO = 14,
+ LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15,
+ LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+ LIBUSB_CLASS_WIRELESS = 0xe0,
+ LIBUSB_CLASS_APPLICATION = 0xfe,
LIBUSB_CLASS_VENDOR_SPEC = 0xff,
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270715 - stable/9/lib/libusb
Author: hselasky
Date: Wed Aug 27 14:18:48 2014
New Revision: 270715
URL: http://svnweb.freebsd.org/changeset/base/270715
Log:
MFC r270133:
Add more USB class codes.
Modified:
stable/9/lib/libusb/libusb.h
Directory Properties:
stable/9/lib/libusb/ (props changed)
Modified: stable/9/lib/libusb/libusb.h
==
--- stable/9/lib/libusb/libusb.hWed Aug 27 14:17:15 2014
(r270714)
+++ stable/9/lib/libusb/libusb.hWed Aug 27 14:18:48 2014
(r270715)
@@ -48,10 +48,18 @@ enum libusb_class_code {
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
LIBUSB_CLASS_PTP = 6,
+ LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
LIBUSB_CLASS_MASS_STORAGE = 8,
LIBUSB_CLASS_HUB = 9,
LIBUSB_CLASS_DATA = 10,
+ LIBUSB_CLASS_SMART_CARD = 11,
+ LIBUSB_CLASS_CONTENT_SECURITY = 13,
+ LIBUSB_CLASS_VIDEO = 14,
+ LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15,
+ LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+ LIBUSB_CLASS_WIRELESS = 0xe0,
+ LIBUSB_CLASS_APPLICATION = 0xfe,
LIBUSB_CLASS_VENDOR_SPEC = 0xff,
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270716 - stable/8/lib/libusb
Author: hselasky
Date: Wed Aug 27 14:20:01 2014
New Revision: 270716
URL: http://svnweb.freebsd.org/changeset/base/270716
Log:
MFC r270133:
Add more USB class codes.
Modified:
stable/8/lib/libusb/libusb.h
Directory Properties:
stable/8/lib/libusb/ (props changed)
Modified: stable/8/lib/libusb/libusb.h
==
--- stable/8/lib/libusb/libusb.hWed Aug 27 14:18:48 2014
(r270715)
+++ stable/8/lib/libusb/libusb.hWed Aug 27 14:20:01 2014
(r270716)
@@ -48,10 +48,18 @@ enum libusb_class_code {
LIBUSB_CLASS_COMM = 2,
LIBUSB_CLASS_HID = 3,
LIBUSB_CLASS_PTP = 6,
+ LIBUSB_CLASS_IMAGE = 6,
LIBUSB_CLASS_PRINTER = 7,
LIBUSB_CLASS_MASS_STORAGE = 8,
LIBUSB_CLASS_HUB = 9,
LIBUSB_CLASS_DATA = 10,
+ LIBUSB_CLASS_SMART_CARD = 11,
+ LIBUSB_CLASS_CONTENT_SECURITY = 13,
+ LIBUSB_CLASS_VIDEO = 14,
+ LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15,
+ LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
+ LIBUSB_CLASS_WIRELESS = 0xe0,
+ LIBUSB_CLASS_APPLICATION = 0xfe,
LIBUSB_CLASS_VENDOR_SPEC = 0xff,
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270717 - stable/10/sys/dev/sound/usb
Author: hselasky
Date: Wed Aug 27 14:22:40 2014
New Revision: 270717
URL: http://svnweb.freebsd.org/changeset/base/270717
Log:
MFC r270134:
Use the bSubslotSize and bSubFrameSize fields to obtain the actual
sample size. According to the USB audio frame format specification
from USB.org, the value in the bBitResolution field can be less than
the actual sample size, depending on the actual hardware, and should
not be used for this computation.
PR: 192755
Modified:
stable/10/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sound/usb/uaudio.c
==
--- stable/10/sys/dev/sound/usb/uaudio.cWed Aug 27 14:20:01 2014
(r270716)
+++ stable/10/sys/dev/sound/usb/uaudio.cWed Aug 27 14:22:40 2014
(r270717)
@@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_
} else if (audio_rev = UAUDIO_VERSION_20) {
uint32_t dwFormat;
- uint8_t bSubslotSize;
dwFormat = UGETDW(asid.v2-bmFormats);
bChannels = asid.v2-bNrChannels;
- bBitResolution = asf1d.v2-bBitResolution;
- bSubslotSize = asf1d.v2-bSubslotSize;
-
- /* Map 4-byte aligned 24-bit samples into 32-bit */
- if (bBitResolution == 24 bSubslotSize == 4)
- bBitResolution = 32;
-
- if (bBitResolution != (bSubslotSize * 8)) {
- DPRINTF(Invalid bSubslotSize\n);
- goto next_ep;
- }
+ bBitResolution = asf1d.v2-bSubslotSize * 8;
if ((bChannels != channels) ||
(bBitResolution != bit_resolution)) {
@@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
wFormat = UGETW(asid.v1-wFormatTag);
bChannels = UAUDIO_MAX_CHAN(asf1d.v1-bNrChannels);
- bBitResolution = asf1d.v1-bBitResolution;
+ bBitResolution = asf1d.v1-bSubFrameSize * 8;
if (asf1d.v1-bSamFreqType == 0) {
DPRINTFN(16, Sample rate: %d-%dHz\n,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270718 - stable/9/sys/dev/sound/usb
Author: hselasky
Date: Wed Aug 27 14:24:00 2014
New Revision: 270718
URL: http://svnweb.freebsd.org/changeset/base/270718
Log:
MFC r270134:
Use the bSubslotSize and bSubFrameSize fields to obtain the actual
sample size. According to the USB audio frame format specification
from USB.org, the value in the bBitResolution field can be less than
the actual sample size, depending on the actual hardware, and should
not be used for this computation.
PR: 192755
Modified:
stable/9/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sound/usb/uaudio.c
==
--- stable/9/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:22:40 2014
(r270717)
+++ stable/9/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:24:00 2014
(r270718)
@@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_
} else if (audio_rev = UAUDIO_VERSION_20) {
uint32_t dwFormat;
- uint8_t bSubslotSize;
dwFormat = UGETDW(asid.v2-bmFormats);
bChannels = asid.v2-bNrChannels;
- bBitResolution = asf1d.v2-bBitResolution;
- bSubslotSize = asf1d.v2-bSubslotSize;
-
- /* Map 4-byte aligned 24-bit samples into 32-bit */
- if (bBitResolution == 24 bSubslotSize == 4)
- bBitResolution = 32;
-
- if (bBitResolution != (bSubslotSize * 8)) {
- DPRINTF(Invalid bSubslotSize\n);
- goto next_ep;
- }
+ bBitResolution = asf1d.v2-bSubslotSize * 8;
if ((bChannels != channels) ||
(bBitResolution != bit_resolution)) {
@@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
wFormat = UGETW(asid.v1-wFormatTag);
bChannels = UAUDIO_MAX_CHAN(asf1d.v1-bNrChannels);
- bBitResolution = asf1d.v1-bBitResolution;
+ bBitResolution = asf1d.v1-bSubFrameSize * 8;
if (asf1d.v1-bSamFreqType == 0) {
DPRINTFN(16, Sample rate: %d-%dHz\n,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270719 - stable/8/sys/dev/sound/usb
Author: hselasky
Date: Wed Aug 27 14:25:18 2014
New Revision: 270719
URL: http://svnweb.freebsd.org/changeset/base/270719
Log:
MFC r270134:
Use the bSubslotSize and bSubFrameSize fields to obtain the actual
sample size. According to the USB audio frame format specification
from USB.org, the value in the bBitResolution field can be less than
the actual sample size, depending on the actual hardware, and should
not be used for this computation.
PR: 192755
Modified:
stable/8/sys/dev/sound/usb/uaudio.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/usb/ (props changed)
Modified: stable/8/sys/dev/sound/usb/uaudio.c
==
--- stable/8/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:24:00 2014
(r270718)
+++ stable/8/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:25:18 2014
(r270719)
@@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_
} else if (audio_rev = UAUDIO_VERSION_20) {
uint32_t dwFormat;
- uint8_t bSubslotSize;
dwFormat = UGETDW(asid.v2-bmFormats);
bChannels = asid.v2-bNrChannels;
- bBitResolution = asf1d.v2-bBitResolution;
- bSubslotSize = asf1d.v2-bSubslotSize;
-
- /* Map 4-byte aligned 24-bit samples into 32-bit */
- if (bBitResolution == 24 bSubslotSize == 4)
- bBitResolution = 32;
-
- if (bBitResolution != (bSubslotSize * 8)) {
- DPRINTF(Invalid bSubslotSize\n);
- goto next_ep;
- }
+ bBitResolution = asf1d.v2-bSubslotSize * 8;
if ((bChannels != channels) ||
(bBitResolution != bit_resolution)) {
@@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
wFormat = UGETW(asid.v1-wFormatTag);
bChannels = UAUDIO_MAX_CHAN(asf1d.v1-bNrChannels);
- bBitResolution = asf1d.v1-bBitResolution;
+ bBitResolution = asf1d.v1-bSubFrameSize * 8;
if (asf1d.v1-bSamFreqType == 0) {
DPRINTFN(16, Sample rate: %d-%dHz\n,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270720 - in head/sys/dev: fb vt/hw/fb vt/hw/ofwfb
Author: dumbbell
Date: Wed Aug 27 15:10:28 2014
New Revision: 270720
URL: http://svnweb.freebsd.org/changeset/base/270720
Log:
vt(4): Fix mouse cursor handling in vt_fb/creator_vt/ofwfb
There were two issues:
1. The area given to vt_is_cursor_in_area() was adding the drawable
area offset, something already handled by this function.
2. The cursor was shifted on the screen by the offset of this area
and thus was misplaced or not erased. Furthermore, when reaching
the bottom or right borders, the cursor was either totally
removed or not erased correctly.
MFC after:1 week
Modified:
head/sys/dev/fb/creator_vt.c
head/sys/dev/vt/hw/fb/vt_fb.c
head/sys/dev/vt/hw/ofwfb/ofwfb.c
Modified: head/sys/dev/fb/creator_vt.c
==
--- head/sys/dev/fb/creator_vt.cWed Aug 27 14:25:18 2014
(r270719)
+++ head/sys/dev/fb/creator_vt.cWed Aug 27 15:10:28 2014
(r270720)
@@ -186,21 +186,20 @@ creatorfb_bitblt_bitmap(struct vt_device
struct creatorfb_softc *sc = vd-vd_softc;
u_long line;
uint32_t fgc, bgc;
- int c;
+ int c, l;
uint8_t b, m;
fgc = sc-fb.fb_cmap[fg];
bgc = sc-fb.fb_cmap[bg];
b = m = 0;
- /* Don't try to put off screen pixels */
- if (((x + width) vd-vd_width) || ((y + height)
- vd-vd_height))
- return;
-
line = (sc-fb.fb_stride * y) + 4*x;
- for (; height 0; height--) {
- for (c = 0; c width; c++) {
+ for (l = 0;
+ l height y + l vw-vw_draw_area.tr_end.tp_row;
+ l++) {
+ for (c = 0;
+ c width x + c vw-vw_draw_area.tr_end.tp_col;
+ c++) {
if (c % 8 == 0)
b = *pattern++;
else
@@ -258,20 +257,17 @@ creatorfb_bitblt_text(struct vt_device *
term_rect_t drawn_area;
- drawn_area.tr_begin.tp_col = area-tr_begin.tp_col * vf-vf_width +
- vw-vw_draw_area.tr_begin.tp_col;
- drawn_area.tr_begin.tp_row = area-tr_begin.tp_row * vf-vf_height +
- vw-vw_draw_area.tr_begin.tp_row;
- drawn_area.tr_end.tp_col = area-tr_end.tp_col * vf-vf_width +
- vw-vw_draw_area.tr_begin.tp_col;
- drawn_area.tr_end.tp_row = area-tr_end.tp_row * vf-vf_height +
- vw-vw_draw_area.tr_begin.tp_row;
+ drawn_area.tr_begin.tp_col = area-tr_begin.tp_col * vf-vf_width;
+ drawn_area.tr_begin.tp_row = area-tr_begin.tp_row * vf-vf_height;
+ drawn_area.tr_end.tp_col = area-tr_end.tp_col * vf-vf_width;
+ drawn_area.tr_end.tp_row = area-tr_end.tp_row * vf-vf_height;
if (vt_is_cursor_in_area(vd, drawn_area)) {
creatorfb_bitblt_bitmap(vd, vw,
vd-vd_mcursor-map, vd-vd_mcursor-mask,
vd-vd_mcursor-width, vd-vd_mcursor-height,
- vd-vd_mx_drawn, vd-vd_my_drawn,
+ vd-vd_mx_drawn + vw-vw_draw_area.tr_begin.tp_col,
+ vd-vd_my_drawn + vw-vw_draw_area.tr_begin.tp_row,
vd-vd_mcursor_fg, vd-vd_mcursor_bg);
}
#endif
Modified: head/sys/dev/vt/hw/fb/vt_fb.c
==
--- head/sys/dev/vt/hw/fb/vt_fb.c Wed Aug 27 14:25:18 2014
(r270719)
+++ head/sys/dev/vt/hw/fb/vt_fb.c Wed Aug 27 15:10:28 2014
(r270720)
@@ -263,17 +263,16 @@ vt_fb_bitblt_bitmap(struct vt_device *vd
b = m = 0;
bpl = (width + 7) 3; /* Bytes per source line. */
- /* Don't try to put off screen pixels */
- if (((x + width) info-fb_width) || ((y + height)
- info-fb_height))
- return;
-
KASSERT((info-fb_vbase != 0), (Unmapped framebuffer));
line = (info-fb_stride * y) + (x * bpp);
- for (l = 0; l height; l++) {
+ for (l = 0;
+ l height y + l vw-vw_draw_area.tr_end.tp_row;
+ l++) {
ch = pattern;
- for (c = 0; c width; c++) {
+ for (c = 0;
+ c width x + c vw-vw_draw_area.tr_end.tp_col;
+ c++) {
if (c % 8 == 0)
b = *ch++;
else
@@ -353,20 +352,17 @@ vt_fb_bitblt_text(struct vt_device *vd,
term_rect_t drawn_area;
- drawn_area.tr_begin.tp_col = area-tr_begin.tp_col * vf-vf_width +
- vw-vw_draw_area.tr_begin.tp_col;
- drawn_area.tr_begin.tp_row = area-tr_begin.tp_row * vf-vf_height +
- vw-vw_draw_area.tr_begin.tp_row;
- drawn_area.tr_end.tp_col = area-tr_end.tp_col * vf-vf_width +
- vw-vw_draw_area.tr_begin.tp_col;
- drawn_area.tr_end.tp_row = area-tr_end.tp_row * vf-vf_height +
-
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
On Wed, Aug 27, 2014 at 01:21:53PM +, Hans Petter Selasky wrote: Author: hselasky Date: Wed Aug 27 13:21:53 2014 New Revision: 270710 URL: http://svnweb.freebsd.org/changeset/base/270710 Log: - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. What upstream OFED version does this update correspond to? It's always useful to know what version our implementation is at when looking at external RDMA code. Regards, Navdeep ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
On 08/27/14 17:32, Navdeep Parhar wrote: On Wed, Aug 27, 2014 at 01:21:53PM +, Hans Petter Selasky wrote: Author: hselasky Date: Wed Aug 27 13:21:53 2014 New Revision: 270710 URL: http://svnweb.freebsd.org/changeset/base/270710 Log: - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. What upstream OFED version does this update correspond to? It's always useful to know what version our implementation is at when looking at external RDMA code. Regards, Navdeep Hi, Forwarded from Mellanox: The MLNX OFED version the driver is taken from is 2.1. --HPS ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270444 - in head/sys: kern sys
On Wed, Aug 27, 2014 at 12:55:22AM +0300, Konstantin Belousov wrote:
On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote:
On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote:
John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400:
On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
Author: mjg
Date: Sun Aug 24 09:04:09 2014
New Revision: 270444
URL: http://svnweb.freebsd.org/changeset/base/270444
Log:
Fix getppid for traced processes.
Traced processes always have the tracer set as the parent.
Utilize proc_realparent to obtain the right process when
needed.
Are you sure this won't break things? I know of several
applications that
expect a debugger to be the parent when attached and change
behavior as a
result (e.g. inserting a breakpoint on an assertion failure
rather than
generating a core).
Shouldn't such applications use a breakpoint instruction like INT3
unconditionally then ? Detection of the attached debugger is inherently
racy, the debugger might have detached after the test. This, and the
fact that default action for the SIGTRAP is coredumping.
Well, this is what linux and solaris do.
Interesting.
I don't feel strongly about this change. If you really want I'm
happy to
revert.
In general I'd like to someday have the debugger-debuggee
relationship not
override parent-child and this is a step in that direction.
However, this
will break existing applications, so this needs to be clearly
documented in
the release notes. In addition, we should probably advertise how a
process
can correctly determine if it is being run under a debugger (right
now you can
do 'getppid()' and use strcmp or strstr on the p_comm of that pid
so you can
do different things for gdb vs gcore, etc. so just checking
P_TRACED from
kinfo_proc wouldn't be equivalent in functionality)
But what about when you attach gdb to a running process... That
doesn't magicly make the now debugged process a child of gdb does it?
% cat hello.c
#include stdio.h
int
main()
{
printf(hello world\n);
(void)getchar();
return (0);
}
% cc -g hello.c -o hello
% ./hello
hello world
load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
different window
% ps -O ppid -p `pgrep hello`
PID PPID TT STAT TIME COMMAND
42599 5340 16 I+ 0:00.00 ./hello
% gdb hello `pgrep hello`
GNU gdb 6.1.1 [FreeBSD]
...
(gdb) hit Ctrl-Z
Suspended
% ps -O ppid -p `pgrep hello`
PID PPID TT STAT TIME COMMAND
42599 45079 16 TX+0:00.00 ./hello
Wow, learn something new every day...
But doesn't that break apps that use getppid to signal their parent
that forked them?
Until mjg@'s commit, yes. It's been that way in FreeBSD at least for
as long as I can remember. Certainly back to 4.x.
The ps(1) trick continues to work after the commit, since kern_proc
sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about
it during the review.
Fixing it requires taking proctree_lock when it is otherwise not needed,
which is somewhat unfortunate.
Anyway, checking the parent pid is definitely not the right way to
see if the process is under ptrace debugging. What if the parent
is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be
the correct indicator.
It was stated they want to do something based on the name of the tracer.
Whether that makes sense or not is unclear for me.
Either way, having a way of checking who traces is a nice thing to
retain.
So how about the following:
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 3a0c323..38a9934 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -157,6 +157,7 @@ static VAR var[] = {
{tdnam, TDNAM, NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
{time, TIME, NULL, USER, cputime, 0, CHAR, NULL, 0},
{tpgid, TPGID, NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
+ {tracer, TRACER, NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
{tsid, TSID, NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
{tsiz, TSIZ, NULL, 0, kvar, KOFF(ki_tsize), PGTOK, ld, 0},
{tt, TT , NULL, 0, tname, 0, CHAR, NULL, 0},
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index d8e56fb..294ecf9 100644
---
svn commit: r270721 - head/sys/dev/vt
Author: dumbbell
Date: Wed Aug 27 17:16:52 2014
New Revision: 270721
URL: http://svnweb.freebsd.org/changeset/base/270721
Log:
vt(4): If the terminal shrinks, make sure the mouse is inside the new area
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Wed Aug 27 15:10:28 2014(r270720)
+++ head/sys/dev/vt/vt_core.c Wed Aug 27 17:16:52 2014(r270721)
@@ -1381,9 +1381,20 @@ vt_change_font(struct vt_window *vw, str
*/
vtfont_unref(vw-vw_font);
vw-vw_font = vtfont_ref(vf);
- vt_compute_drawable_area(vw);
}
+ /*
+* Compute the drawable area and move the mouse cursor inside
+* it, in case the new area is smaller than the previous one.
+*/
+ vt_compute_drawable_area(vw);
+ vd-vd_mx = min(vd-vd_mx,
+ vw-vw_draw_area.tr_end.tp_col -
+ vw-vw_draw_area.tr_begin.tp_col - 1);
+ vd-vd_my = min(vd-vd_my,
+ vw-vw_draw_area.tr_end.tp_row -
+ vw-vw_draw_area.tr_begin.tp_row - 1);
+
/* Force a full redraw the next timer tick. */
if (vd-vd_curwindow == vw) {
vt_set_border(vw, vf, TC_BLACK);
@@ -2272,8 +2283,8 @@ vt_resize(struct vt_device *vd)
if (!(vd-vd_flags VDF_TEXTMODE) vw-vw_font == NULL)
vw-vw_font = vtfont_ref(vt_font_default);
VT_UNLOCK(vd);
+
/* Resize terminal windows */
- vt_compute_drawable_area(vw);
while (vt_change_font(vw, vw-vw_font) == EBUSY) {
DPRINTF(100, %s: vt_change_font() is busy,
window %d\n, __func__, i);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270722 - head/sbin/gbde
Author: jhb Date: Wed Aug 27 17:44:59 2014 New Revision: 270722 URL: http://svnweb.freebsd.org/changeset/base/270722 Log: Correct the destroy example. The -n argument is not needed (and is not valid). Reported by: mwlucas Reviewed by: phk MFC after:1 week Modified: head/sbin/gbde/gbde.8 Modified: head/sbin/gbde/gbde.8 == --- head/sbin/gbde/gbde.8 Wed Aug 27 17:16:52 2014(r270721) +++ head/sbin/gbde/gbde.8 Wed Aug 27 17:44:59 2014(r270722) @@ -31,7 +31,7 @@ .\ .\ $FreeBSD$ .\ -.Dd October 1, 2013 +.Dd August 27, 2014 .Dt GBDE 8 .Os .Sh NAME @@ -235,7 +235,7 @@ pass-phrase: .Pp To destroy all copies of the masterkey: .Pp -.Dl gbde destroy ada0s1f -n -1 +.Dl gbde destroy ada0s1f .Sh SEE ALSO .Xr gbde 4 , .Xr geom 4 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270444 - in head/sys: kern sys
On Tuesday, August 26, 2014 5:55:22 pm Konstantin Belousov wrote: On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote: On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: Author: mjg Date: Sun Aug 24 09:04:09 2014 New Revision: 270444 URL: http://svnweb.freebsd.org/changeset/base/270444 Log: Fix getppid for traced processes. Traced processes always have the tracer set as the parent. Utilize proc_realparent to obtain the right process when needed. Are you sure this won't break things? I know of several applications that expect a debugger to be the parent when attached and change behavior as a result (e.g. inserting a breakpoint on an assertion failure rather than generating a core). Shouldn't such applications use a breakpoint instruction like INT3 unconditionally then ? Detection of the attached debugger is inherently racy, the debugger might have detached after the test. This, and the fact that default action for the SIGTRAP is coredumping. For whatever reason, the developer may want to not core dump but just log (maybe thrown an exception) normally, but if gdb is attached, it wants to always trigger a breakpoint first (the one I can currently think of is in some uber-fancy assertion handling class). Until mjg@'s commit, yes. It's been that way in FreeBSD at least for as long as I can remember. Certainly back to 4.x. The ps(1) trick continues to work after the commit, since kern_proc sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about it during the review. Ah, well. Anyway, checking the parent pid is definitely not the right way to see if the process is under ptrace debugging. What if the parent is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be the correct indicator. As noted before, that just tells you that something is tracing you, but it might be strace or truss. The evil code above actually looks at p_comm name of the pid and does strstr() gdb or the like. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270723 - stable/10
Author: truckman Date: Wed Aug 27 18:00:58 2014 New Revision: 270723 URL: http://svnweb.freebsd.org/changeset/base/270723 Log: MFC r270510 Catch up to gcc 3.3 - 3.4 upgrade. Modified: stable/10/ObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/ObsoleteFiles.inc == --- stable/10/ObsoleteFiles.inc Wed Aug 27 17:44:59 2014(r270722) +++ stable/10/ObsoleteFiles.inc Wed Aug 27 18:00:58 2014(r270723) @@ -3063,6 +3063,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
RE: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
-Original Message- From: owner-src-committ...@freebsd.org [mailto:owner-src- committ...@freebsd.org] On Behalf Of Slawa Olhovchenkov Sent: Wednesday, August 27, 2014 7:09 AM To: Andrew Thompson Cc: src-committ...@freebsd.org; svn-src-all@freebsd.org; svn-src- sta...@freebsd.org; svn-src-stable...@freebsd.org Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts On Tue, Aug 26, 2014 at 02:31:37AM +, Andrew Thompson wrote: In zfs directory layout you missing some separate datesets: usr/home (or, may be, just /home) usr/obj usr/ports/packages usr/ports/distfiles Can you do it before 10.1? You must have missed the following in the evolution of that script: http://svnweb.freebsd.org/base?view=revisionrevision=257842 [snip] + Remove some unnecessary default ZFS datasets from the automatic zfsboot script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db /var/empty /var/mail and /var/run (these can all be created as-needed once the system is installed). [/snip] The idea is that all of those directories you mentioned are empty by default on a freshly installed system. Compare that to directories which are not empty -- if the user wants the data in a separate dataset, they have salvage existing data in the process. -- Devin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270724 - in stable/10: etc/mtree lib/libutil lib/libutil/tests tools/regression/lib/libutil
Author: ngie
Date: Wed Aug 27 18:25:14 2014
New Revision: 270724
URL: http://svnweb.freebsd.org/changeset/base/270724
Log:
MFC r270180:
r269906:
Add missing BSD.tests.dist entry for lib/libutil to unbreak installworld with
MK_TESTS == no
Phabric: D555
Approved by: jmmv (mentor, implicit)
Pointyhat to: ngie
r269904:
Integrate lib/libutil into the build/kyua
Remove the .t wrappers
Rename all of the TAP test applications from test-test to
test_test to match the convention described in the TestSuite
wiki page
humanize_number_test.c:
- Fix -Wformat warnings with counter variables
- Fix minor style(9) issues:
-- Header sorting
-- Variable declaration alignment/sorting in main(..)
-- Fit the lines in 80 columns
- Fix an off by one index error in the testcase output [*]
- Remove unnecessary `extern char * optarg;` (this is already provided by
unistd.h)
Phabric: D555
Approved by: jmmv (mentor)
Obtained from: EMC / Isilon Storage Division [*]
Submitted by: Casey Peel cp...@isilon.com [*]
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/lib/libutil/tests/
- copied from r269904, head/lib/libutil/tests/
Deleted:
stable/10/tools/regression/lib/libutil/
Modified:
stable/10/etc/mtree/BSD.tests.dist
stable/10/lib/libutil/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist Wed Aug 27 18:00:58 2014
(r270723)
+++ stable/10/etc/mtree/BSD.tests.dist Wed Aug 27 18:25:14 2014
(r270724)
@@ -87,6 +87,8 @@
..
libmp
..
+libutil
+..
..
libexec
atf
Modified: stable/10/lib/libutil/Makefile
==
--- stable/10/lib/libutil/Makefile Wed Aug 27 18:00:58 2014
(r270723)
+++ stable/10/lib/libutil/Makefile Wed Aug 27 18:25:14 2014
(r270724)
@@ -81,4 +81,8 @@ MLINKS+=pw_util.3 pw_copy.3 \
pw_util.3 pw_tempname.3 \
pw_util.3 pw_tmp.3
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
.include bsd.lib.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
On Wed, Aug 27, 2014 at 11:02:28AM -0700, dte...@freebsd.org wrote: -Original Message- From: owner-src-committ...@freebsd.org [mailto:owner-src- committ...@freebsd.org] On Behalf Of Slawa Olhovchenkov Sent: Wednesday, August 27, 2014 7:09 AM To: Andrew Thompson Cc: src-committ...@freebsd.org; svn-src-all@freebsd.org; svn-src- sta...@freebsd.org; svn-src-stable...@freebsd.org Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts On Tue, Aug 26, 2014 at 02:31:37AM +, Andrew Thompson wrote: In zfs directory layout you missing some separate datesets: usr/home (or, may be, just /home) usr/obj usr/ports/packages usr/ports/distfiles Can you do it before 10.1? You must have missed the following in the evolution of that script: http://svnweb.freebsd.org/base?view=revisionrevision=257842 [snip] + Remove some unnecessary default ZFS datasets from the automatic zfsboot script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db /var/empty /var/mail and /var/run (these can all be created as-needed once the system is installed). [/snip] The idea is that all of those directories you mentioned are empty by default on a freshly installed system. Compare that to directories which are not empty -- if the user wants the data in a separate dataset, they have salvage existing data in the process. /home is not empty on a freshly installed system (I am create account for remoty login). Other datasets have special atributes and removing datasets is simples then creating and to easy to forget create their before use. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270725 - vendor/tzdata/dist
Author: pluknet Date: Wed Aug 27 18:49:41 2014 New Revision: 270725 URL: http://svnweb.freebsd.org/changeset/base/270725 Log: Vendor import of tzdata2014f. - Russia time zone changes. - New zones: Asia/Chita and Asia/Srednekolymsk. - Lots of changes wrt. time zone abbreviations and historical data. - New zone tab data format. Obtained from:ftp://ftp.iana.org/tz/releases/ Added: vendor/tzdata/dist/zone1970.tab Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/antarctica vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/backward vendor/tzdata/dist/etcetera vendor/tzdata/dist/europe vendor/tzdata/dist/factory vendor/tzdata/dist/iso3166.tab vendor/tzdata/dist/leap-seconds.list vendor/tzdata/dist/northamerica vendor/tzdata/dist/pacificnew vendor/tzdata/dist/southamerica vendor/tzdata/dist/systemv vendor/tzdata/dist/yearistype.sh vendor/tzdata/dist/zone.tab Modified: vendor/tzdata/dist/africa == --- vendor/tzdata/dist/africa Wed Aug 27 18:25:14 2014(r270724) +++ vendor/tzdata/dist/africa Wed Aug 27 18:49:41 2014(r270725) @@ -1,4 +1,3 @@ -# pre # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -35,13 +34,13 @@ # Previous editions of this database used WAT, CAT, SAT, and EAT # for +0:00 through +3:00, respectively, # but Mark R V Murray reports that -# `SAST' is the official abbreviation for +2:00 in the country of South Africa, -# `CAT' is commonly used for +2:00 in countries north of South Africa, and -# `WAT' is probably the best name for +1:00, as the common phrase for -# the area that includes Nigeria is ``West Africa''. -# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference. +# 'SAST' is the official abbreviation for +2:00 in the country of South Africa, +# 'CAT' is commonly used for +2:00 in countries north of South Africa, and +# 'WAT' is probably the best name for +1:00, as the common phrase for +# the area that includes Nigeria is West Africa. +# He has heard of Western Sahara Time for +0:00 but can find no reference. # -# To make things confusing, `WAT' seems to have been used for -1:00 long ago; +# To make things confusing, 'WAT' seems to have been used for -1:00 long ago; # I'd guess that this was because people needed _some_ name for -1:00, # and at the time, far west Africa was the only major land area in -1:00. # This usage is now obsolete, as the last use of -1:00 on the African @@ -54,7 +53,7 @@ # 2:00 SASTSouth Africa Standard Time # and Murray suggests the following abbreviation: # 1:00 WAT West Africa Time -# I realize that this leads to `WAT' being used for both -1:00 and 1:00 +# I realize that this leads to 'WAT' being used for both -1:00 and 1:00 # for times before 1976, but this is the best I can think of # until we get more information. # @@ -131,9 +130,7 @@ ZoneAfrica/Gaborone 1:43:40 - LMT 1885 2:00- CAT # Burkina Faso -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ouagadougou-0:06:04 - LMT 1912 -0:00 - GMT +# See Africa/Abidjan. # Burundi # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -161,7 +158,7 @@ ZoneAfrica/Bangui 1:14:20 - LMT 1912 # Chad # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00- WAT 1979 Oct 14 1:001:00WAST1980 Mar 8 1:00- WAT @@ -183,10 +180,20 @@ Zone Africa/Lubumbashi1:49:52 - LMT 189 Zone Africa/Brazzaville1:01:08 - LMT 1912 1:00- WAT -# Cote D'Ivoire +# Côte D'Ivoire / Ivory Coast # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912 0:00 - GMT +Link Africa/Abidjan Africa/Bamako # Mali +Link Africa/Abidjan Africa/Banjul # Gambia +Link Africa/Abidjan Africa/Conakry # Guinea +Link Africa/Abidjan Africa/Dakar # Senegal +Link Africa/Abidjan Africa/Freetown# Sierra Leone +Link Africa/Abidjan Africa/Lome# Togo +Link Africa/Abidjan Africa/Nouakchott # Mauritania +Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso +Link Africa/Abidjan Africa/Sao_Tome# São Tomé and Príncipe +Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -231,13 +238,9 @@ Rule Egypt 19901994- May 1 1:001:00 # Egyptians would approve the cancellation. # # Egypt to cancel daylight saving time -# a
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
Hi! Did this get reviewed at all? Removing those files may make it more annoying to port some other linux code in the future, as some future linux driver code may include those files. -a On 27 August 2014 06:21, Hans Petter Selasky hsela...@freebsd.org wrote: Author: hselasky Date: Wed Aug 27 13:21:53 2014 New Revision: 270710 URL: http://svnweb.freebsd.org/changeset/base/270710 Log: - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. - Remove empty files from the OFED Linux Emulation layer. - Fix compile warnings related to printf() and the %lld and %llx format specifiers. - Add some missing 2-clause BSD copyrights. - Add Mellanox Technologies, Ltd. to list of copyright holders. - Add some new compatibility files. - Fix order of uninit in the mlx4ib module to avoid crash at unload using the new module_exit_order() function. MFC after:1 week Sponsored by: Mellanox Technologies Added: head/sys/ofed/include/linux/cache.h (contents, props changed) head/sys/ofed/include/linux/etherdevice.h (contents, props changed) head/sys/ofed/include/linux/kmod.h (contents, props changed) head/sys/ofed/include/linux/ktime.h (contents, props changed) head/sys/ofed/include/linux/math64.h (contents, props changed) head/sys/ofed/include/net/if_inet6.h (contents, props changed) Deleted: head/sys/ofed/include/asm/current.h head/sys/ofed/include/asm/semaphore.h head/sys/ofed/include/asm/system.h head/sys/ofed/include/linux/atomic.h head/sys/ofed/include/linux/bitmap.h head/sys/ofed/include/linux/ctype.h head/sys/ofed/include/linux/init.h head/sys/ofed/include/linux/rtnetlink.h head/sys/ofed/include/linux/stddef.h head/sys/ofed/include/net/addrconf.h head/sys/ofed/include/net/arp.h head/sys/ofed/include/net/ip6_route.h head/sys/ofed/include/net/neighbour.h Modified: head/sys/contrib/rdma/krping/krping.c head/sys/dev/cxgb/cxgb_osdep.h head/sys/dev/cxgbe/iw_cxgbe/cm.c head/sys/dev/cxgbe/iw_cxgbe/qp.c head/sys/modules/mlx4/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlxen/Makefile head/sys/ofed/drivers/infiniband/core/addr.c head/sys/ofed/drivers/infiniband/core/cm.c head/sys/ofed/drivers/infiniband/core/device.c head/sys/ofed/drivers/infiniband/core/iwcm.c head/sys/ofed/drivers/infiniband/core/sa_query.c head/sys/ofed/drivers/infiniband/core/sysfs.c head/sys/ofed/drivers/infiniband/core/ucm.c head/sys/ofed/drivers/infiniband/core/user_mad.c head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c head/sys/ofed/drivers/infiniband/core/uverbs_main.c head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c head/sys/ofed/drivers/infiniband/hw/mlx4/main.c head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c head/sys/ofed/drivers/net/mlx4/alloc.c head/sys/ofed/drivers/net/mlx4/cmd.c head/sys/ofed/drivers/net/mlx4/cq.c head/sys/ofed/drivers/net/mlx4/en_netdev.c head/sys/ofed/drivers/net/mlx4/en_rx.c head/sys/ofed/drivers/net/mlx4/eq.c head/sys/ofed/drivers/net/mlx4/fw.c head/sys/ofed/drivers/net/mlx4/main.c head/sys/ofed/drivers/net/mlx4/mcg.c head/sys/ofed/drivers/net/mlx4/mr.c head/sys/ofed/drivers/net/mlx4/pd.c head/sys/ofed/drivers/net/mlx4/qp.c head/sys/ofed/drivers/net/mlx4/reset.c head/sys/ofed/drivers/net/mlx4/resource_tracker.c head/sys/ofed/drivers/net/mlx4/sense.c head/sys/ofed/drivers/net/mlx4/srq.c head/sys/ofed/drivers/net/mlx4/xrcd.c head/sys/ofed/include/asm/atomic-long.h head/sys/ofed/include/asm/atomic.h head/sys/ofed/include/asm/byteorder.h head/sys/ofed/include/asm/fcntl.h head/sys/ofed/include/asm/io.h head/sys/ofed/include/asm/page.h head/sys/ofed/include/asm/pgtable.h head/sys/ofed/include/asm/types.h head/sys/ofed/include/asm/uaccess.h head/sys/ofed/include/linux/bitops.h head/sys/ofed/include/linux/cdev.h head/sys/ofed/include/linux/clocksource.h head/sys/ofed/include/linux/compat.h head/sys/ofed/include/linux/compiler.h head/sys/ofed/include/linux/completion.h head/sys/ofed/include/linux/delay.h head/sys/ofed/include/linux/device.h head/sys/ofed/include/linux/dma-attrs.h head/sys/ofed/include/linux/dma-mapping.h head/sys/ofed/include/linux/dmapool.h head/sys/ofed/include/linux/err.h
svn commit: r270726 - vendor/tzdata/tzdata2014f
Author: pluknet Date: Wed Aug 27 18:51:54 2014 New Revision: 270726 URL: http://svnweb.freebsd.org/changeset/base/270726 Log: Tag of tzdata2014f Added: vendor/tzdata/tzdata2014f/ - copied from r270725, vendor/tzdata/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270727 - head/tools/tools/perforce
Author: jmg
Date: Wed Aug 27 18:56:12 2014
New Revision: 270727
URL: http://svnweb.freebsd.org/changeset/base/270727
Log:
add scripts for generating a diff from p4...
awkdiff is the script from scottl that he got from ken a long time
ago... It no longer lives in his home dir, so give it a new home...
This does simple massaging of p4 output to create a useful diff...
The script p4diffbranch will create a diff that includes new and
deleted files unlike the normal diff2 -b command... So will be useful
for extracting patches from p4... It does take a changeset that will
be used to diff against...
Added:
head/tools/tools/perforce/
head/tools/tools/perforce/awkdiff (contents, props changed)
head/tools/tools/perforce/p4diffbranch (contents, props changed)
Added: head/tools/tools/perforce/awkdiff
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/tools/perforce/awkdiff Wed Aug 27 18:56:12 2014
(r270727)
@@ -0,0 +1,42 @@
+#!/usr/bin/awk -f
+#
+# $FreeBSD$
+#
+
+BEGIN {
+ #parentpath = //depot/vendor/freebsd/src/sys/
+ #childpath = //depot/projects/opencrypto/
+}
+$1 == {
+ last_line = $0
+ last_filename = $2
+ #gsub(parentpath, , last_filename)
+ gsub(/#[0-9]*$/, , last_filename)
+ did_sub = 0
+}
+$1 == $2 == none {
+ new_file = $4
+ gsub(childpath, , new_file)
+ gsub(/#[0-9]*$/, , new_file)
+ cmd = p4 print \ $4 \ | sed '/^\\/\\/depot/d' | diff -u /dev/null
/dev/stdin | sed s@/dev/stdin@ new_file @
+ #print x cmd x
+ system(cmd)
+}
+$1 == $4 == none {
+ del_file = $2
+ gsub(parentpath, , del_file)
+ gsub(/#[0-9]*$/, , del_file)
+ cmd = p4 print \ $2 \ | sed '/^\\/\\/depot/d' | diff -u /dev/stdin
/dev/null | sed s@/dev/stdin@ del_file @
+ #print x cmd x
+ system(cmd)
+}
+$1 != {
+ if (!did_sub (($1 == ***) || ($1 == @@))) {
+ print --- , last_filename .orig
+ print +++ , last_filename
+ print $0
+ did_sub = 1
+ } else {
+ print $0
+ }
+}
Added: head/tools/tools/perforce/p4diffbranch
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/tools/perforce/p4diffbranch Wed Aug 27 18:56:12 2014
(r270727)
@@ -0,0 +1,19 @@
+#!/bin/sh -
+#
+# $FreeBSD$
+#
+
+if [ x$# != x2 ]; then
+ echo Usage: $0 branch changesetnum
+ exit 1
+fi
+
+basescript=$(realpath $0)
+awkdiff=${basescript%/*}/awkdiff
+
+branch=$1
+changenum=$2
+
+p4 branch -o $branch |
+ awk ' /^View:/ { doview = 1; next; } /^[^ ]/ {doview = 0; next; }
$1 $2 doview == 1 { system(p4 diff2 -du $1 @ changenum $2) }'
changenum=$changenum |
+ $awkdiff
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270444 - in head/sys: kern sys
On Wed, Aug 27, 2014 at 06:54:32PM +0200, Mateusz Guzik wrote: So how about the following: You need to update kinfo_proc32 in sys/compat/freebsd32/freebsd32.h and freebsd32_kinfo_proc_out() in kern/kern_proc.c. Otherwise, 32bit kinfo_proc is broken, in particular, you can see 32 bit ps(1) dumping garbage. pgpRs2tag02X8.pgp Description: PGP signature
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
Hi, On 08/27/14 20:50, Adrian Chadd wrote: Hi! Did this get reviewed at all? Yes. Removing those files may make it more annoying to port some other linux code in the future, as some future linux driver code may include those files. At the stage where this emulation layer is, you will most likely need to edit the include files anyway, which should not be that hard. Do you know of any code outside the tree using this emulation layer? --HPS ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
On 27 August 2014 11:59, Hans Petter Selasky h...@selasky.org wrote: Hi, On 08/27/14 20:50, Adrian Chadd wrote: Hi! Did this get reviewed at all? Yes. Removing those files may make it more annoying to port some other linux code in the future, as some future linux driver code may include those files. At the stage where this emulation layer is, you will most likely need to edit the include files anyway, which should not be that hard. Do you know of any code outside the tree using this emulation layer? A couple of us were about to review using the ofed linux compat code for the drm2 code from dragonflybsd. -a ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
On Wed, Aug 27, 2014 at 11:59 AM, Hans Petter Selasky h...@selasky.org wrote: Removing those files may make it more annoying to port some other linux code in the future, as some future linux driver code may include those files. On a (somewhat) related note, I would like to see sema(9) replaced by sx(9) in the compatibility layer. I've a couple of patches that get rid of the deprecated primitive in aio/ips code, and planned to look at ofed as well, but if somebody with deep driver knowledge can do that on my behalf it would be great. -- Davide There are no solved problems; there are only problems that are more or less solved -- Henri Poincare ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270728 - head/contrib/tzdata
Author: pluknet Date: Wed Aug 27 19:26:35 2014 New Revision: 270728 URL: http://svnweb.freebsd.org/changeset/base/270728 Log: MFV of r270725, tzdata2014f - Russia time zone changes. - New zones: Asia/Chita and Asia/Srednekolymsk. - Lots of changes wrt. time zone abbreviations and historical data. - New zone tab data format. Added: head/contrib/tzdata/zone1970.tab - copied, changed from r270725, vendor/tzdata/dist/zone1970.tab Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leap-seconds.list head/contrib/tzdata/northamerica head/contrib/tzdata/pacificnew head/contrib/tzdata/southamerica head/contrib/tzdata/systemv head/contrib/tzdata/yearistype.sh head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Wed Aug 27 18:56:12 2014(r270727) +++ head/contrib/tzdata/africa Wed Aug 27 19:26:35 2014(r270728) @@ -1,4 +1,3 @@ -# pre # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -35,13 +34,13 @@ # Previous editions of this database used WAT, CAT, SAT, and EAT # for +0:00 through +3:00, respectively, # but Mark R V Murray reports that -# `SAST' is the official abbreviation for +2:00 in the country of South Africa, -# `CAT' is commonly used for +2:00 in countries north of South Africa, and -# `WAT' is probably the best name for +1:00, as the common phrase for -# the area that includes Nigeria is ``West Africa''. -# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference. +# 'SAST' is the official abbreviation for +2:00 in the country of South Africa, +# 'CAT' is commonly used for +2:00 in countries north of South Africa, and +# 'WAT' is probably the best name for +1:00, as the common phrase for +# the area that includes Nigeria is West Africa. +# He has heard of Western Sahara Time for +0:00 but can find no reference. # -# To make things confusing, `WAT' seems to have been used for -1:00 long ago; +# To make things confusing, 'WAT' seems to have been used for -1:00 long ago; # I'd guess that this was because people needed _some_ name for -1:00, # and at the time, far west Africa was the only major land area in -1:00. # This usage is now obsolete, as the last use of -1:00 on the African @@ -54,7 +53,7 @@ # 2:00 SASTSouth Africa Standard Time # and Murray suggests the following abbreviation: # 1:00 WAT West Africa Time -# I realize that this leads to `WAT' being used for both -1:00 and 1:00 +# I realize that this leads to 'WAT' being used for both -1:00 and 1:00 # for times before 1976, but this is the best I can think of # until we get more information. # @@ -131,9 +130,7 @@ ZoneAfrica/Gaborone 1:43:40 - LMT 1885 2:00- CAT # Burkina Faso -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ouagadougou-0:06:04 - LMT 1912 -0:00 - GMT +# See Africa/Abidjan. # Burundi # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -161,7 +158,7 @@ ZoneAfrica/Bangui 1:14:20 - LMT 1912 # Chad # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00- WAT 1979 Oct 14 1:001:00WAST1980 Mar 8 1:00- WAT @@ -183,10 +180,20 @@ Zone Africa/Lubumbashi1:49:52 - LMT 189 Zone Africa/Brazzaville1:01:08 - LMT 1912 1:00- WAT -# Cote D'Ivoire +# Côte D'Ivoire / Ivory Coast # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912 0:00 - GMT +Link Africa/Abidjan Africa/Bamako # Mali +Link Africa/Abidjan Africa/Banjul # Gambia +Link Africa/Abidjan Africa/Conakry # Guinea +Link Africa/Abidjan Africa/Dakar # Senegal +Link Africa/Abidjan Africa/Freetown# Sierra Leone +Link Africa/Abidjan Africa/Lome# Togo +Link Africa/Abidjan Africa/Nouakchott # Mauritania +Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso +Link Africa/Abidjan Africa/Sao_Tome# São Tomé and Príncipe +Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -231,13 +238,9 @@ Rule Egypt 19901994- May 1 1:001:00 # Egyptians would approve the
svn commit: r270729 - head/share/zoneinfo
Author: pluknet Date: Wed Aug 27 19:34:49 2014 New Revision: 270729 URL: http://svnweb.freebsd.org/changeset/base/270729 Log: Fix comments on updating tzdata releases. Modified: head/share/zoneinfo/Makefile Modified: head/share/zoneinfo/Makefile == --- head/share/zoneinfo/MakefileWed Aug 27 19:26:35 2014 (r270728) +++ head/share/zoneinfo/MakefileWed Aug 27 19:34:49 2014 (r270729) @@ -17,15 +17,15 @@ # $ cd ~/svn/vendor/tzdata # $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \ # svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X -# $ svn update # Commit message: Tag of tzdata2008X +# $ svn commit # Commit message: Tag of tzdata2008X # # Merge-from-vendor # -# $ cd ~/svn/head/share/zoneinfo +# $ cd ~/svn/head/contrib/tzdata # $ svn update # $ svn merge -c X --accept=postpone \ # svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist . -# $ svn update # Commit message: MFV of tzdata2008X +# $ svn commit # Commit message: MFV of tzdata2008X # CLEANFILES+= yearistype ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270730 - stable/9/lib/libproc
Author: markj
Date: Wed Aug 27 19:51:07 2014
New Revision: 270730
URL: http://svnweb.freebsd.org/changeset/base/270730
Log:
MFC r265255, r270506:
Allow a.out as an alias for the executable if no other matching entries
are found.
Modified:
stable/9/lib/libproc/_libproc.h
stable/9/lib/libproc/proc_create.c
stable/9/lib/libproc/proc_rtld.c
stable/9/lib/libproc/proc_sym.c
Directory Properties:
stable/9/lib/libproc/ (props changed)
Modified: stable/9/lib/libproc/_libproc.h
==
--- stable/9/lib/libproc/_libproc.h Wed Aug 27 19:34:49 2014
(r270729)
+++ stable/9/lib/libproc/_libproc.h Wed Aug 27 19:51:07 2014
(r270730)
@@ -46,6 +46,8 @@ struct proc_handle {
size_t rdobjsz;
size_t nobjs;
struct lwpstatus lwps;
+ rd_loadobj_t *rdexec; /* rdobj index of program executable. */
+ charexecname[MAXPATHLEN]; /* Path to program executable. */
};
#ifdef DEBUG
Modified: stable/9/lib/libproc/proc_create.c
==
--- stable/9/lib/libproc/proc_create.c Wed Aug 27 19:34:49 2014
(r270729)
+++ stable/9/lib/libproc/proc_create.c Wed Aug 27 19:51:07 2014
(r270730)
@@ -26,8 +26,10 @@
* $FreeBSD$
*/
-#include _libproc.h
-#include stdio.h
+#include sys/types.h
+#include sys/sysctl.h
+#include sys/wait.h
+
#include err.h
#include errno.h
#include fcntl.h
@@ -35,7 +37,37 @@
#include stdlib.h
#include string.h
#include unistd.h
-#include sys/wait.h
+
+#include _libproc.h
+
+static int proc_init(pid_t, int, int, struct proc_handle *);
+
+static int
+proc_init(pid_t pid, int flags, int status, struct proc_handle *phdl)
+{
+ int mib[4], error;
+ size_t len;
+
+ memset(phdl, 0, sizeof(*phdl));
+ phdl-pid = pid;
+ phdl-flags = flags;
+ phdl-status = status;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_PATHNAME;
+ mib[3] = pid;
+ len = sizeof(phdl-execname);
+ if (sysctl(mib, 4, phdl-execname, len, NULL, 0) != 0) {
+ error = errno;
+ DPRINTF(ERROR: cannot get pathname for child process %d, pid);
+ return (error);
+ }
+ if (len == 0)
+ phdl-execname[0] = '\0';
+
+ return (0);
+}
int
proc_attach(pid_t pid, int flags, struct proc_handle **pphdl)
@@ -54,12 +86,12 @@ proc_attach(pid_t pid, int flags, struct
if ((phdl = malloc(sizeof(struct proc_handle))) == NULL)
return (ENOMEM);
- memset(phdl, 0, sizeof(struct proc_handle));
- phdl-pid = pid;
- phdl-flags = flags;
- phdl-status = PS_RUN;
elf_version(EV_CURRENT);
+ error = proc_init(pid, flags, PS_RUN, phdl);
+ if (error != 0)
+ goto out;
+
if (ptrace(PT_ATTACH, phdl-pid, 0, 0) != 0) {
error = errno;
DPRINTF(ERROR: cannot ptrace child process %d, pid);
@@ -123,9 +155,9 @@ proc_create(const char *file, char * con
_exit(2);
} else {
/* The parent owns the process handle. */
- memset(phdl, 0, sizeof(struct proc_handle));
- phdl-pid = pid;
- phdl-status = PS_IDLE;
+ error = proc_init(pid, 0, PS_IDLE, phdl);
+ if (error != 0)
+ goto bad;
/* Wait for the child process to stop. */
if (waitpid(pid, status, WUNTRACED) == -1) {
Modified: stable/9/lib/libproc/proc_rtld.c
==
--- stable/9/lib/libproc/proc_rtld.cWed Aug 27 19:34:49 2014
(r270729)
+++ stable/9/lib/libproc/proc_rtld.cWed Aug 27 19:51:07 2014
(r270730)
@@ -49,6 +49,9 @@ map_iter(const rd_loadobj_t *lop, void *
if (phdl-rdobjs == NULL)
return (-1);
}
+ if (strcmp(lop-rdl_path, phdl-execname) == 0
+ (lop-rdl_prot RD_RDL_X) != 0)
+ phdl-rdexec = phdl-rdobjs[phdl-nobjs];
memcpy(phdl-rdobjs[phdl-nobjs++], lop, sizeof(*lop));
return (0);
Modified: stable/9/lib/libproc/proc_sym.c
==
--- stable/9/lib/libproc/proc_sym.c Wed Aug 27 19:34:49 2014
(r270729)
+++ stable/9/lib/libproc/proc_sym.c Wed Aug 27 19:51:07 2014
(r270730)
@@ -90,17 +90,25 @@ proc_obj2map(struct proc_handle *p, cons
rd_loadobj_t *rdl;
char path[MAXPATHLEN];
+ rdl = NULL;
for (i = 0; i p-nobjs; i++) {
- rdl = p-rdobjs[i];
- basename_r(rdl-rdl_path, path);
+ basename_r(p-rdobjs[i].rdl_path, path);
if (strcmp(path, objname) == 0) {
- if ((map =
svn commit: r270731 - stable/10/lib/libproc
Author: markj
Date: Wed Aug 27 19:51:42 2014
New Revision: 270731
URL: http://svnweb.freebsd.org/changeset/base/270731
Log:
MFC r265255, r270506:
Allow a.out as an alias for the executable if no other matching entries
are found.
Modified:
stable/10/lib/libproc/_libproc.h
stable/10/lib/libproc/proc_create.c
stable/10/lib/libproc/proc_rtld.c
stable/10/lib/libproc/proc_sym.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libproc/_libproc.h
==
--- stable/10/lib/libproc/_libproc.hWed Aug 27 19:51:07 2014
(r270730)
+++ stable/10/lib/libproc/_libproc.hWed Aug 27 19:51:42 2014
(r270731)
@@ -46,6 +46,8 @@ struct proc_handle {
size_t rdobjsz;
size_t nobjs;
struct lwpstatus lwps;
+ rd_loadobj_t *rdexec; /* rdobj index of program executable. */
+ charexecname[MAXPATHLEN]; /* Path to program executable. */
};
#ifdef DEBUG
Modified: stable/10/lib/libproc/proc_create.c
==
--- stable/10/lib/libproc/proc_create.c Wed Aug 27 19:51:07 2014
(r270730)
+++ stable/10/lib/libproc/proc_create.c Wed Aug 27 19:51:42 2014
(r270731)
@@ -26,8 +26,10 @@
* $FreeBSD$
*/
-#include _libproc.h
-#include stdio.h
+#include sys/types.h
+#include sys/sysctl.h
+#include sys/wait.h
+
#include err.h
#include errno.h
#include fcntl.h
@@ -35,7 +37,37 @@
#include stdlib.h
#include string.h
#include unistd.h
-#include sys/wait.h
+
+#include _libproc.h
+
+static int proc_init(pid_t, int, int, struct proc_handle *);
+
+static int
+proc_init(pid_t pid, int flags, int status, struct proc_handle *phdl)
+{
+ int mib[4], error;
+ size_t len;
+
+ memset(phdl, 0, sizeof(*phdl));
+ phdl-pid = pid;
+ phdl-flags = flags;
+ phdl-status = status;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_PATHNAME;
+ mib[3] = pid;
+ len = sizeof(phdl-execname);
+ if (sysctl(mib, 4, phdl-execname, len, NULL, 0) != 0) {
+ error = errno;
+ DPRINTF(ERROR: cannot get pathname for child process %d, pid);
+ return (error);
+ }
+ if (len == 0)
+ phdl-execname[0] = '\0';
+
+ return (0);
+}
int
proc_attach(pid_t pid, int flags, struct proc_handle **pphdl)
@@ -54,12 +86,12 @@ proc_attach(pid_t pid, int flags, struct
if ((phdl = malloc(sizeof(struct proc_handle))) == NULL)
return (ENOMEM);
- memset(phdl, 0, sizeof(struct proc_handle));
- phdl-pid = pid;
- phdl-flags = flags;
- phdl-status = PS_RUN;
elf_version(EV_CURRENT);
+ error = proc_init(pid, flags, PS_RUN, phdl);
+ if (error != 0)
+ goto out;
+
if (ptrace(PT_ATTACH, phdl-pid, 0, 0) != 0) {
error = errno;
DPRINTF(ERROR: cannot ptrace child process %d, pid);
@@ -123,9 +155,9 @@ proc_create(const char *file, char * con
_exit(2);
} else {
/* The parent owns the process handle. */
- memset(phdl, 0, sizeof(struct proc_handle));
- phdl-pid = pid;
- phdl-status = PS_IDLE;
+ error = proc_init(pid, 0, PS_IDLE, phdl);
+ if (error != 0)
+ goto bad;
/* Wait for the child process to stop. */
if (waitpid(pid, status, WUNTRACED) == -1) {
Modified: stable/10/lib/libproc/proc_rtld.c
==
--- stable/10/lib/libproc/proc_rtld.c Wed Aug 27 19:51:07 2014
(r270730)
+++ stable/10/lib/libproc/proc_rtld.c Wed Aug 27 19:51:42 2014
(r270731)
@@ -49,6 +49,9 @@ map_iter(const rd_loadobj_t *lop, void *
if (phdl-rdobjs == NULL)
return (-1);
}
+ if (strcmp(lop-rdl_path, phdl-execname) == 0
+ (lop-rdl_prot RD_RDL_X) != 0)
+ phdl-rdexec = phdl-rdobjs[phdl-nobjs];
memcpy(phdl-rdobjs[phdl-nobjs++], lop, sizeof(*lop));
return (0);
Modified: stable/10/lib/libproc/proc_sym.c
==
--- stable/10/lib/libproc/proc_sym.cWed Aug 27 19:51:07 2014
(r270730)
+++ stable/10/lib/libproc/proc_sym.cWed Aug 27 19:51:42 2014
(r270731)
@@ -113,17 +113,25 @@ proc_obj2map(struct proc_handle *p, cons
rd_loadobj_t *rdl;
char path[MAXPATHLEN];
+ rdl = NULL;
for (i = 0; i p-nobjs; i++) {
- rdl = p-rdobjs[i];
- basename_r(rdl-rdl_path, path);
+ basename_r(p-rdobjs[i].rdl_path, path);
if (strcmp(path, objname) == 0) {
- if ((map =
Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drive
On 08/27/14 21:08, Davide Italiano wrote: On Wed, Aug 27, 2014 at 11:59 AM, Hans Petter Selasky h...@selasky.org wrote: Removing those files may make it more annoying to port some other linux code in the future, as some future linux driver code may include those files. On a (somewhat) related note, I would like to see sema(9) replaced by sx(9) in the compatibility layer. I've a couple of patches that get rid of the deprecated primitive in aio/ips code, and planned to look at ofed as well, but if somebody with deep driver knowledge can do that on my behalf it would be great. Hi, If you have a patch for ofed/, send it to me and I can test it for you. Thanks! --HPS ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270733 - in stable/9: share/man/man4 sys/dev/mfi
Author: markj
Date: Wed Aug 27 21:11:19 2014
New Revision: 270733
URL: http://svnweb.freebsd.org/changeset/base/270733
Log:
MFC r261491 (by ambrisko):
Add a tunable hw.mfi.mrsas_enable to allow mfi(4) to drop priority and
allow mrsas(4) from LSI to attach to newer LSI cards that are support by
mrsas(4). If mrsas(4) is not loaded into the system at boot then mfi(4)
will always attach. If a modified mrsas(4) is loaded in the system. That
modification is return -30 in it's probe since that is between
BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY.
This option is controller by a new probe flag MFI_FLAGS_MRSAS in mfi_ident
that denotes cards that should work with mrsas(4). New entries that should
have this option.
This is the first step to get mrsas(4) checked into FreeBSD and to avoid
collision with people that use mrsas(4) from LSI. Since mfi(4) takes
priority, then mrsas(4) users need to rebuild GENERIC. Using the
.disabled=1 method doesn't work since that blocks attaching and the
probe gave it to mfi(4).
MFC r267451 (by delphij):
Correct variable for loader tunable variable hw.mfi.mrsas_enable.
Modified:
stable/9/share/man/man4/mfi.4
stable/9/sys/dev/mfi/mfi_pci.c
stable/9/sys/dev/mfi/mfivar.h
Directory Properties:
stable/9/share/man/man4/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/share/man/man4/mfi.4
==
--- stable/9/share/man/man4/mfi.4 Wed Aug 27 21:11:19 2014
(r270732)
+++ stable/9/share/man/man4/mfi.4 Wed Aug 27 21:11:19 2014
(r270733)
@@ -72,6 +72,17 @@ If the sysctl
.Va dev.mfi.%d.delete_busy_volumes
is set to 1,
then the driver will allow mounted volumes to be removed.
+.Pp
+A tunable is provided to adjust the
+.Nm
+driver's behaviour when attaching to a card. By default the driver will
+attach to all known cards with high probe priority. If the tunable
+.Va hw.mfi.mrsas_enable
+is set to 1,
+then the driver will reduce its probe priority to allow
+.Cd mrsas
+to attach to the card instead of
+.Nm .
.Sh HARDWARE
The
.Nm
Modified: stable/9/sys/dev/mfi/mfi_pci.c
==
--- stable/9/sys/dev/mfi/mfi_pci.c Wed Aug 27 21:11:19 2014
(r270732)
+++ stable/9/sys/dev/mfi/mfi_pci.c Wed Aug 27 21:11:19 2014
(r270733)
@@ -112,6 +112,11 @@ TUNABLE_INT(hw.mfi.msi, mfi_msi);
SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, mfi_msi, 0,
Enable use of MSI interrupts);
+static int mfi_mrsas_enable = 0;
+TUNABLE_INT(hw.mfi.mrsas_enable, mfi_mrsas_enable);
+SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, mfi_mrsas_enable,
+ 0, Allow mrasas to take newer cards);
+
struct mfi_ident {
uint16_tvendor;
uint16_tdevice;
@@ -120,19 +125,19 @@ struct mfi_ident {
int flags;
const char *desc;
} mfi_identifiers[] = {
- {0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H810 Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Embedded},
- {0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Mini (blades)},
- {0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Mini (monolithics)},
- {0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Mini (blades)},
- {0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Mini (monolithics)},
- {0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Intel (R) RAID Controller RS25DB080},
- {0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Intel (R) RAID Controller RS25NB008},
- {0x1000, 0x005b, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
ThunderBolt},
- {0x1000, 0x005d, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_INVADER, Invader},
- {0x1000, 0x005f, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_FURY, Fury},
+ {0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H810 Adapter},
+ {0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710 Embedded},
+ {0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710P Adapter},
+ {0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710P Mini (blades)},
+ {0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY|
svn commit: r270732 - in stable/10: share/man/man4 sys/dev/mfi
Author: markj
Date: Wed Aug 27 21:11:19 2014
New Revision: 270732
URL: http://svnweb.freebsd.org/changeset/base/270732
Log:
MFC r261491 (by ambrisko):
Add a tunable hw.mfi.mrsas_enable to allow mfi(4) to drop priority and
allow mrsas(4) from LSI to attach to newer LSI cards that are support by
mrsas(4). If mrsas(4) is not loaded into the system at boot then mfi(4)
will always attach. If a modified mrsas(4) is loaded in the system. That
modification is return -30 in it's probe since that is between
BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY.
This option is controller by a new probe flag MFI_FLAGS_MRSAS in mfi_ident
that denotes cards that should work with mrsas(4). New entries that should
have this option.
This is the first step to get mrsas(4) checked into FreeBSD and to avoid
collision with people that use mrsas(4) from LSI. Since mfi(4) takes
priority, then mrsas(4) users need to rebuild GENERIC. Using the
.disabled=1 method doesn't work since that blocks attaching and the
probe gave it to mfi(4).
MFC r267451 (by delphij):
Correct variable for loader tunable variable hw.mfi.mrsas_enable.
Modified:
stable/10/share/man/man4/mfi.4
stable/10/sys/dev/mfi/mfi_pci.c
stable/10/sys/dev/mfi/mfivar.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man4/mfi.4
==
--- stable/10/share/man/man4/mfi.4 Wed Aug 27 19:51:42 2014
(r270731)
+++ stable/10/share/man/man4/mfi.4 Wed Aug 27 21:11:19 2014
(r270732)
@@ -72,6 +72,17 @@ If the sysctl
.Va dev.mfi.%d.delete_busy_volumes
is set to 1,
then the driver will allow mounted volumes to be removed.
+.Pp
+A tunable is provided to adjust the
+.Nm
+driver's behaviour when attaching to a card. By default the driver will
+attach to all known cards with high probe priority. If the tunable
+.Va hw.mfi.mrsas_enable
+is set to 1,
+then the driver will reduce its probe priority to allow
+.Cd mrsas
+to attach to the card instead of
+.Nm .
.Sh HARDWARE
The
.Nm
Modified: stable/10/sys/dev/mfi/mfi_pci.c
==
--- stable/10/sys/dev/mfi/mfi_pci.c Wed Aug 27 19:51:42 2014
(r270731)
+++ stable/10/sys/dev/mfi/mfi_pci.c Wed Aug 27 21:11:19 2014
(r270732)
@@ -112,6 +112,11 @@ TUNABLE_INT(hw.mfi.msi, mfi_msi);
SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, mfi_msi, 0,
Enable use of MSI interrupts);
+static int mfi_mrsas_enable = 0;
+TUNABLE_INT(hw.mfi.mrsas_enable, mfi_mrsas_enable);
+SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, mfi_mrsas_enable,
+ 0, Allow mrasas to take newer cards);
+
struct mfi_ident {
uint16_tvendor;
uint16_tdevice;
@@ -120,19 +125,19 @@ struct mfi_ident {
int flags;
const char *desc;
} mfi_identifiers[] = {
- {0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H810 Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Embedded},
- {0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Mini (blades)},
- {0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710P Mini (monolithics)},
- {0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Adapter},
- {0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Mini (blades)},
- {0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Dell PERC H710 Mini (monolithics)},
- {0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Intel (R) RAID Controller RS25DB080},
- {0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
Intel (R) RAID Controller RS25NB008},
- {0x1000, 0x005b, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT,
ThunderBolt},
- {0x1000, 0x005d, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_INVADER, Invader},
- {0x1000, 0x005f, 0x, 0x, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_FURY, Fury},
+ {0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H810 Adapter},
+ {0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710 Embedded},
+ {0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710P Adapter},
+ {0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710P Mini (blades)},
+ {0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT|
MFI_FLAGS_MRSAS, Dell PERC H710P Mini (monolithics)},
+ {0x1000,
svn commit: r270734 - in head/sys: contrib/dev/iwn modules/iwnfw modules/iwnfw/iwn100
Author: adrian Date: Thu Aug 28 00:05:02 2014 New Revision: 270734 URL: http://svnweb.freebsd.org/changeset/base/270734 Log: Add iwn-100 firmware. The firmware is from the Linux firmware git repository; the intel licence is the same as other firmware blobs. Tested: iwn1: Intel Centrino Wireless-N 100 mem 0xf480-0xf4801fff irq 19 at device 0.0 on pci5 Added: head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu head/sys/modules/iwnfw/iwn100/ head/sys/modules/iwnfw/iwn100/Makefile (contents, props changed) Modified: head/sys/modules/iwnfw/Makefile Added: head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uuThu Aug 28 00:05:02 2014(r270734) @@ -0,0 +1,5925 @@ +begin-base64 644 iwlwifi-100-39.31.5.1 +AElXTAoxMDAgZncgdjM5LjMxLjUuMSBidWlsZCAzMjg5NQoA +AQUfJ3+BAAEw7AEAICCADwAAQABpIAAAaSBAAGkg +AABpIEAAICCADwAA6ABpIAAAaSBAAGkgAABpIEAAICCADwAAMAVpIAAAaSBAAGkgAABKIAAASiEA +AEoiAABKIwAASiQAAEolAABKJgAASicAAEogABBKIQAQSiIAEEojABBKJAAQSiUAEEomABBKJwAQ +SiAAIEohACBKIgAgSiMAIEokACBKJQAgSiYAIEonACBKIAAwSiEAMAokgD+AAADAQSycMEAsnDBC +JBw0CiKAP4AA1FkKIwA3jg4AAEomAHBpIEAASiYAcEomAHBKJgBwSiYAcAAWAHCAAHAEQHggIECH +AArIz3GgAMgfDhkYgAvIDxkYgAzIEBkYgA0SAjYAyER4ERkYgA7ILRkYgOB+4cT8 +HMi+/BxIvuHA4cHhwuHD/BwIsfwcSLH8HIix/BzIsfwcCLL8HEiy/ByIsvwcyLL8HAi/aiSAEOHE +aiTAEOHE8cDPcKAA0BsUgM9xgABsBAQggI/PUQThAKEK8i8pAQDPcIAAYAnwIEAAQHja/9HAwcRr +JMAQwcRrJIAQwcSfdAQUCzQEFAo0BBQJNAQUCDQEFAc0BBQGNAQUBTQEFAQ0wcPBwsHBwcDBxEUs +fhAKJkB+wcRrJIAUwcQgIECHCsiHuAoaGDALyJu4CxoYMAzIDBoYMA3Ih7gNGhgwDsiFIMMPDhoY +MOB+4HjxwArIlbgKGhgwC8ibuAsaGDANyIq4jbiQuA0aGDDPcIAAiAoYiIHgC/QNyM9xAAAQCqy4 +DRoYMEINIAAP2GfY6g3gAIohRwHRwOB+8cDPcQMAQA3PcKAAqCAtoM9ygAC4BCCCAWkAoqINIAFI +2M9wgADECCWAI4EggcdxAACIE44OgAfi8eB4z3CAAMQIHQaAB+B48cBmC0ABgODPdoAAbAQG8oHg +BvQB2APwANgLroDhBvKB4Qb0AdgD8ADYCq6A4gbygeIG9AHYA/AA2AyuANjPdaAAyB8YHRiQC46A +4IohEAAO8giOgOAM8s9wAwBADUUdGBAwpQLYGB0YkAPwMaUKjoDgGvIJjoDgFvLPcAEAMOwgHRiQ +z3CAACgAIR0YkM9wgABoBCIdGJAYFQCWRSAAAxgdGJAMjoDgB/IYFQCWhSABBBgdGJCA4xjyANiU +uM92gACoBACmcdgGuAYIIAH82SCGz3AAAEwc9g/gAJ+5GBUAloW4GB0YkOkCQAFpIEAA/vHgePHA +pcFBwELBDBwAMRAcQDHPcYAA/Fo0GcAPMBkADywZwA4oGYAOJBlADs9wgAD8WiAYQAvPcIAA/Foc +GAALz3CAAPxaGBjACs9wgAD8WhQYgArPcIAA/FoQGMAIz3CAAPxaDBiACM9wgAD8WggYQAjPcYAA +gFqAGQAIfBnAB3gZgAd0GUAHcBkAB2wZAAdoGYAGZBlABmAZAAZcGcAFWBmABVQZQAVQGQAFTBnA +BEgZgAREGUAEQBkABO+hzqGtoYyhLBnAAigZgAIkGUACIBkAAhwZwAEYGYABFBlAARAZAAFjoWog +AAPYGQAAaiDAAtQZAABqIIAC0BkAAGogQAHIGQAAaiAAAcQZAABqIMAAwBkAAGoggAC8GQAAaiBA +ALgZAABqIAAAtBkAAGoggAHMGQAAz3GfALj/GIFTJ841UyXENVMmxTWUuBihQMMBwALB17oMFAYw +yXMA3ZYL4AAQFAcwz3CgALQPvKDPcaAAyDsugS4L4AB92LYJQAGSDuAAqXAI2ADZUg7gAJm5NvHx +wLYIYAF72AoL4ADX2c9xgAD8WjQZwA8wGQAPLBnADigZgA4kGUAOz3CAAPxaIBhAC89wgAD8WhwY +AAvPcIAA/FoYGMAKz3CAAPxaFBiACs9wgAD8WhAYwAjPcIAA/FoMGIAIz3CAAPxaCBhACM9xgACA +WoAZAAh8GcAHeBmAB3QZQAdwGQAHbBkAB2gZgAZkGUAGYBkABlwZwAVYGYAFVBlABVAZAAVMGcAE +SBmABEQZQARAGQAE76HOoa2hjKEsGcACKBmAAiQZQAIgGQACHBnAARgZgAEUGUABEBkAAWOhaiAA +A9gZAABqIMAC1BkAAGoggALQGQAAaiBAAcgZAABqIAABxBkAAGogwADAGQAAaiCAALwZAABqIEAA +uBkAAGogAAC0GQAAaiCAAcwZAADrds91oADQG1wVEBDPcAAARBziCSABCifAHzpwz3CAAHAWA4CA +4AbyF4VRIMCAlAcCAQfYwgkgAQq4UyBBBwfY2gzgAAq4z3CgANQLGIBCIAAISCAAAM9zgADMFc9x +gACoBCCBnBsAAAshQITKICIDOPRMIICgDvRRIYClCvKg4Ej3USFApRzYyiDhBirwBNgo8IwgAaAh +8kIgQSCP4T4ADQAzJkFwgAAAQEAnAHI0eAB4SiBAIA3YFPBKIIAg6PFKIAAhE9gM8EogACIU2Ajw +SiAAJBXYBPAW2ALwD9hxg+lxyXIKJAAEWQTv/wolQATgeBEDz//xwCYJwAB12OII4ACKIQoDVgsA +AJ4PgAGf/qIIAAAKIcAP63IG2IojSgdKJAAAHQTv/wolAAHgeIDh8cAD8qDgi/YKIcAP63IF2Onb +SiRAAPkD7/+4c89ygABgCRV6IKLRwOB+ANmeuRl5z3KAAFgJAYIleOB/AaIA2Z65GXnPcoAAWAkB +giZ44H8BogDZnrkZec9wgABYCQGAJHhCIACA4H/KIGIA4HjPcIAAWAkBgOB/LygBAOB48cDyCM// +4HjgeOB44HhpIIABbyE/AGkgAAD38fHAatgSCOAAiiFEAwDYjbjuC6ADCBoYMBDMhiD/ignyz3CA +AAUFAIiA4CwIwgOw8fHAUgjAA89xgADMEfAhAABAeIDZz3CgANAbMKCg8eB48cCSDQABz3CAAGwE +oIDPcIAAiAoIgAQljR8PAADg67gF9FILgAmA4A70z3GgALRHANhLGRiAAdh3GRiAANieuFQZGIAE +JYIfAQAAABJqz3OAAHwEIIOkeOGDBCWOHwAAAEAHeSCjBHkGJUAQA74EJYEfgKR+XXpFecd/ +5H7GeAK5BCWNHwIAAACkeSZ4LygBAE4gQQTPcIAAiApVEIAA4aOA4M92oADIHxkaWDAP8s9woAAU +BCqgCYC44En3z3KgAIggAdg1egCiM/DPcYAADAUA2AChAN+RvxMe2JPPcIAA3AIQeM91oAC0R0kd +GJDPcYAAdHrPcIAAEAUgoG8gQwBUHRiQAdimCqADCBoYMGIKgAmA4A30Ex7Yk89wgAAMBBB4SR0Y +kG8gQwBUHRiQyQQAAeB48cDhxc9xgADcCIARAADPdaAAyB8vKgEAz3ADAEANRR0YEPAhgABAeIDY +FR0YkKUEAAHgePHAz3GAAGwEfNhSDqAAIIEKIcAP63IF2IojxABKJAAAmQHv/wolAAHxwOHFz3CA +AGwEoIBr2AQljR8PAADgHg6gAIohSAMvKEEDqg6gDU4gQAQKJQCAyiHCD8oiwgfKIGIByiOCDwAA +EwJQAeL/yiRiAH/YCrjPcaAA0BsToX/YEKEdBAAB4HjxwGvYzg2gAIohCAheDqANBNgKJQCAyiHC +D8oiwgfKIGIByiOCDwAAIgIIAeL/yiRiABkFz//gePHAVguADYDZz3CgANAbMKABBc//SiRAdQDZ +qCDAA89wgADgCTZ4YYBAgM9wgADcCAHhVXhgoOB+4H7geFEhQMfxwB3yz3CAAMwFAICD4Mohwg/K
svn commit: r270735 - stable/9
Author: truckman Date: Thu Aug 28 01:14:30 2014 New Revision: 270735 URL: http://svnweb.freebsd.org/changeset/base/270735 Log: MFC r270510: Catch up to gcc 3.3 - 3.4 upgrade. Modified: stable/9/ObsoleteFiles.inc (contents, props changed) Directory Properties: stable/9/ (props changed) Modified: stable/9/ObsoleteFiles.inc == --- stable/9/ObsoleteFiles.inc Thu Aug 28 00:05:02 2014(r270734) +++ stable/9/ObsoleteFiles.inc Thu Aug 28 01:14:30 2014(r270735) @@ -2456,6 +2456,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
svn commit: r270736 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Aug 28 01:14:59 2014 New Revision: 270736 URL: http://svnweb.freebsd.org/changeset/base/270736 Log: Correct the note about r270401: s/pam(3)/pam_group(8) Submitted by: jilles Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Aug 28 01:14:30 2014(r270735) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Aug 28 01:14:59 2014(r270736) @@ -959,7 +959,8 @@ literal-onbsp;vers=4/literal./para para revision=270401Support for the quoteaccount/quote - facility has been added to man.pam.3; library./para + facility has been added to the man.pam.group.8; + module./para sect3 xml:id=rc-scripts titlefilename/etc/rc.d/filename Scripts/title ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270737 - stable/8
Author: truckman Date: Thu Aug 28 01:15:56 2014 New Revision: 270737 URL: http://svnweb.freebsd.org/changeset/base/270737 Log: MFC r270510: Catch up to gcc 3.3 - 3.4 upgrade. Modified: stable/8/ObsoleteFiles.inc (contents, props changed) Directory Properties: stable/8/ (props changed) Modified: stable/8/ObsoleteFiles.inc == --- stable/8/ObsoleteFiles.inc Thu Aug 28 01:14:59 2014(r270736) +++ stable/8/ObsoleteFiles.inc Thu Aug 28 01:15:56 2014(r270737) @@ -1972,6 +1972,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
RE: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
-Original Message- From: Slawa Olhovchenkov [mailto:s...@zxy.spb.ru] Sent: Wednesday, August 27, 2014 11:49 AM To: dte...@freebsd.org Cc: 'Andrew Thompson'; src-committ...@freebsd.org; svn-src- a...@freebsd.org; svn-src-sta...@freebsd.org; svn-src-stable- 1...@freebsd.org Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts On Wed, Aug 27, 2014 at 11:02:28AM -0700, dte...@freebsd.org wrote: -Original Message- From: owner-src-committ...@freebsd.org [mailto:owner-src- committ...@freebsd.org] On Behalf Of Slawa Olhovchenkov Sent: Wednesday, August 27, 2014 7:09 AM To: Andrew Thompson Cc: src-committ...@freebsd.org; svn-src-all@freebsd.org; svn-src- sta...@freebsd.org; svn-src-stable...@freebsd.org Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts On Tue, Aug 26, 2014 at 02:31:37AM +, Andrew Thompson wrote: In zfs directory layout you missing some separate datesets: usr/home (or, may be, just /home) usr/obj usr/ports/packages usr/ports/distfiles Can you do it before 10.1? You must have missed the following in the evolution of that script: http://svnweb.freebsd.org/base?view=revisionrevision=257842 [snip] + Remove some unnecessary default ZFS datasets from the automatic zfsboot script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db /var/empty /var/mail and /var/run (these can all be created as-needed once the system is installed). [/snip] The idea is that all of those directories you mentioned are empty by default on a freshly installed system. Compare that to directories which are not empty -- if the user wants the data in a separate dataset, they have salvage existing data in the process. /home is not empty on a freshly installed system (I am create account for remoty login). I quote from your above test: usr/home (or, may be, just /home) On a freshly installed 10-STABLE snapshot: root@zbeastie:~ # ls /home ls: /home: No such file or directory root@zbeastie:~ # ls /usr/home root@zbeastie:~ # df -h /usr/home FilesystemSizeUsed Avail Capacity Mounted on zroot/usr/home 17G 96K 17G 0%/usr/home Now compare that to the following code: http://svnweb.freebsd.org/base/head/usr.sbin/bsdinstall/scripts/zfsboot?view =markup Read: There is a /usr/home already -- what's the issue? Other datasets have special atributes and removing datasets is simples then creating and to easy to forget create their before use. Perhaps; but if you're really deploying that many systems (to which it is a need that each be setup in the same [custom] manner), you really out to make a custom installer. Just rip open the installer ISO, create the following file: FILE: /etc/installerconfig ZFSBOOT_DATASETS= # your custom settings here -- see /usr/libexec/bsdinstall/zfsboot # END-QUOTE Then repack the ISO and use that instead of the generic release media. -- Devin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270738 - head/sys/dev/iwn
Author: adrian
Date: Thu Aug 28 03:18:27 2014
New Revision: 270738
URL: http://svnweb.freebsd.org/changeset/base/270738
Log:
Fix antenna configuration, microcode version checks and rate selection
in preparation for the 5300 3x3 NIC.
During this particular adventure, I did indeed discover that a whole
swath of things made little to no sense.
Those included, and are fixed here:
* A lot of the antenna configuration bits assume the NIC has two receive
chains. That's blatantly untrue for NICs that don't.
* There was some disconnect between the antenna configuration when
forming a PLCP rate DWORD (which includes the transmit antenna
configuration), separate to the link quality antenna configuration.
So now there's helper functions to return which antenna configurations
to use and those are used wherever an antenna config is required.
* The 5300 does up to three stream TX/RX (so MCS0-23), however
the link quality table has only 16 slots. This means all of the
rate entries are .. well, dual-stream rates. If this is the case,
the last MIMO parameter can't be 16 or it panics the firmware.
Set it to 15.
* .. and since yes it has 16 slots, it only would try retransmitting
from MCS8-MCS23, which can be quite .. terrible. Hard-code the last
two retry slots to be the lowest configured rate.
* I noticed some transmit configuration command stuff is different
based on firmware API version, so I lifted that code from Linux.
* Add / augment some more logging to make it easier to capture this
stuff.
Now, 3x3 is still terrible because the link quality configuration is
plainly not good enough. I'll have to think about that.
However, the original goal of this - 3x3 operation on the Intel
5300 NIC - actually worked.
There are also rate control bugs in the way this driver handles
notifying the net80211 rate control code when AMPDU is enabled.
It always steps the rate up to the maximum rate possible - and
this eventually ends in much sadness. I'll fix that later.
As a side note - 2GHz HT40 now works on all the NICs I have tested.
As a second side note - this exposed some bad 3x3 behaviour in
the ath(4) rate control code where it starts off at a 3-stream rate
and doesn't downgrade quickly enough. This makes the initial
dhcp exchange take a long time. I'll fix the ath(4) rate code
to start at a low fixed 1x1 MCS rate and step up if everything
works out.
Tested:
* Intel 2200
* Intel 2230
* Intel 5300
* Intel 5100
* Intel 6205
* Intel 100
TODO:
* Test the other NICs more thoroughly!
Thank you to Michael Kosarev russian...@gmail.com for donating the
Intel 5300 NIC and pestering me about it since last year to try and
make it all work.
Modified:
head/sys/dev/iwn/if_iwn.c
head/sys/dev/iwn/if_iwnreg.h
head/sys/dev/iwn/if_iwnvar.h
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Thu Aug 28 01:15:56 2014(r270737)
+++ head/sys/dev/iwn/if_iwn.c Thu Aug 28 03:18:27 2014(r270738)
@@ -393,6 +393,15 @@ iwn_probe(device_t dev)
}
static int
+iwn_is_3stream_device(struct iwn_softc *sc)
+{
+ /* XXX for now only 5300, until the 5350 can be tested */
+ if (sc-hw_type == IWN_HW_REV_TYPE_5300)
+ return (1);
+ return (0);
+}
+
+static int
iwn_attach(device_t dev)
{
struct iwn_softc *sc = (struct iwn_softc *)device_get_softc(dev);
@@ -594,21 +603,16 @@ iwn_attach(device_t dev)
ic-ic_txstream = sc-ntxchains;
/*
-* The NICs we currently support cap out at 2x2 support
-* separate from the chains being used.
-*
-* This is a total hack to work around that until some
-* per-device method is implemented to return the
-* actual stream support.
-*
-* XXX Note: the 5350 is a 3x3 device; so we shouldn't
-* cap this! But, anything that touches rates in the
-* driver needs to be audited first before 3x3 is enabled.
+* Some of the 3 antenna devices (ie, the 4965) only supports
+* 2x2 operation. So correct the number of streams if
+* it's not a 3-stream device.
*/
- if (ic-ic_rxstream 2)
- ic-ic_rxstream = 2;
- if (ic-ic_txstream 2)
- ic-ic_txstream = 2;
+ if (! iwn_is_3stream_device(sc)) {
+ if (ic-ic_rxstream 2)
+ ic-ic_rxstream = 2;
+ if (ic-ic_txstream 2)
+ ic-ic_txstream = 2;
+ }
ic-ic_htcaps =
Re: svn commit: r270444 - in head/sys: kern sys
On Wed, Aug 27, 2014 at 09:59:03PM +0300, Konstantin Belousov wrote:
On Wed, Aug 27, 2014 at 06:54:32PM +0200, Mateusz Guzik wrote:
So how about the following:
You need to update kinfo_proc32 in sys/compat/freebsd32/freebsd32.h
and freebsd32_kinfo_proc_out() in kern/kern_proc.c. Otherwise,
32bit kinfo_proc is broken, in particular, you can see 32 bit
ps(1) dumping garbage.
Oops.
Tested with 32-bit ps.
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 3a0c323..38a9934 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -157,6 +157,7 @@ static VAR var[] = {
{tdnam, TDNAM, NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
{time, TIME, NULL, USER, cputime, 0, CHAR, NULL, 0},
{tpgid, TPGID, NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
+ {tracer, TRACER, NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
{tsid, TSID, NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
{tsiz, TSIZ, NULL, 0, kvar, KOFF(ki_tsize), PGTOK, ld, 0},
{tt, TT , NULL, 0, tname, 0, CHAR, NULL, 0},
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index d8e56fb..294ecf9 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -29,7 +29,7 @@
.\ @(#)ps.1 8.3 (Berkeley) 4/18/94
.\ $FreeBSD$
.\
-.Dd August 7, 2014
+.Dd August 27, 2014
.Dt PS 1
.Os
.Sh NAME
@@ -665,6 +665,8 @@ accumulated CPU time, user + system (alias
.Cm cputime )
.It Cm tpgid
control terminal process group ID
+.It Cm tracer
+tracer process ID
.\.It Cm trss
.\text resident set size (in Kbytes)
.It Cm tsid
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 94f886e..155612b 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -343,6 +343,7 @@ struct kinfo_proc32 {
charki_loginclass[LOGINCLASSLEN+1];
charki_sparestrings[50];
int ki_spareints[KI_NSPARE_INT];
+ int ki_tracer;
int ki_flag2;
int ki_fibnum;
u_int ki_cr_flags;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 6689186..740c4a6 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
struct ucred *cred;
struct sigacts *ps;
+ /* For proc_realparent. */
+ sx_assert(proctree_lock, SX_LOCKED);
PROC_LOCK_ASSERT(p, MA_OWNED);
bzero(kp, sizeof(*kp));
@@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
kp-ki_acflag = p-p_acflag;
kp-ki_lock = p-p_lock;
if (p-p_pptr)
- kp-ki_ppid = p-p_pptr-p_pid;
+ kp-ki_ppid = proc_realparent(p)-p_pid;
+ if (p-p_flag P_TRACED)
+ kp-ki_tracer = p-p_pptr-p_pid;
}
/*
@@ -1166,6 +1170,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki,
struct kinfo_proc32 *ki32)
bcopy(ki-ki_comm, ki32-ki_comm, COMMLEN + 1);
bcopy(ki-ki_emul, ki32-ki_emul, KI_EMULNAMELEN + 1);
bcopy(ki-ki_loginclass, ki32-ki_loginclass, LOGINCLASSLEN + 1);
+ CP(*ki, *ki32, ki_tracer);
CP(*ki, *ki32, ki_flag2);
CP(*ki, *ki32, ki_fibnum);
CP(*ki, *ki32, ki_cr_flags);
@@ -1287,10 +1292,11 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
error = sysctl_wire_old_buffer(req, 0);
if (error)
return (error);
+ sx_slock(proctree_lock);
error = pget((pid_t)name[0], PGET_CANSEE, p);
- if (error != 0)
- return (error);
- error = sysctl_out_proc(p, req, flags, 0);
+ if (error == 0)
+ error = sysctl_out_proc(p, req, flags, 0);
+ sx_sunlock(proctree_lock);
return (error);
}
@@ -1318,6 +1324,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
error = sysctl_wire_old_buffer(req, 0);
if (error != 0)
return (error);
+ sx_slock(proctree_lock);
sx_slock(allproc_lock);
for (doingzomb=0 ; doingzomb 2 ; doingzomb++) {
if (!doingzomb)
@@ -1422,11 +1429,13 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
error = sysctl_out_proc(p, req, flags, doingzomb);
if (error) {
sx_sunlock(allproc_lock);
+ sx_sunlock(proctree_lock);
return (error);
}
}
}
sx_sunlock(allproc_lock);
+ sx_sunlock(proctree_lock);
return (0);
}
diff --git a/sys/sys/user.h b/sys/sys/user.h
index f7b18df..6775ff7 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -84,7 +84,7 @@
* it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and
* function kvm_proclist in lib/libkvm/kvm_proc.c .
*/
-#defineKI_NSPARE_INT 7
+#defineKI_NSPARE_INT 6
#defineKI_NSPARE_LONG 12
svn commit: r270739 - stable/10/sys/dev/vmware/vmxnet3
Author: bryanv Date: Thu Aug 28 04:20:24 2014 New Revision: 270739 URL: http://svnweb.freebsd.org/changeset/base/270739 Log: MFC r267632: Fix GCC compile warning: Variable(s) can be used uninitialized. PR: 193076 Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmx.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmx.c == --- stable/10/sys/dev/vmware/vmxnet3/if_vmx.c Thu Aug 28 03:18:27 2014 (r270738) +++ stable/10/sys/dev/vmware/vmxnet3/if_vmx.c Thu Aug 28 04:20:24 2014 (r270739) @@ -2619,10 +2619,12 @@ vmxnet3_txq_offload_ctx(struct vmxnet3_t struct ether_vlan_header *evh; int offset; #if defined(INET) - struct ip *ip, iphdr; + struct ip *ip = NULL; + struct ip iphdr; #endif #if defined(INET6) - struct ip6_hdr *ip6, ip6hdr; + struct ip6_hdr *ip6 = NULL; + struct ip6_hdr ip6hdr; #endif evh = mtod(m, struct ether_vlan_header *); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r270740 - head/share/man/man9
Author: hselasky Date: Thu Aug 28 04:35:38 2014 New Revision: 270740 URL: http://svnweb.freebsd.org/changeset/base/270740 Log: Add description of sysctl_remove_name() function. Modified: head/share/man/man9/Makefile head/share/man/man9/sysctl_add_oid.9 Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileThu Aug 28 04:20:24 2014 (r270739) +++ head/share/man/man9/MakefileThu Aug 28 04:35:38 2014 (r270740) @@ -1379,7 +1379,8 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_ULONG.9 \ sysctl.9 SYSCTL_UQUAD.9 MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \ - sysctl_add_oid.9 sysctl_remove_oid.9 + sysctl_add_oid.9 sysctl_remove_oid.9 \ + sysctl_add_oid.9 sysctl_remove_name.9 MLINKS+=sysctl_ctx_init.9 sysctl_ctx_entry_add.9 \ sysctl_ctx_init.9 sysctl_ctx_entry_del.9 \ sysctl_ctx_init.9 sysctl_ctx_entry_find.9 \ Modified: head/share/man/man9/sysctl_add_oid.9 == --- head/share/man/man9/sysctl_add_oid.9Thu Aug 28 04:20:24 2014 (r270739) +++ head/share/man/man9/sysctl_add_oid.9Thu Aug 28 04:35:38 2014 (r270740) @@ -27,13 +27,14 @@ .\ .\ $FreeBSD$ .\ -.Dd July 31, 2014 +.Dd August 28, 2014 .Dt SYSCTL_ADD_OID 9 .Os .Sh NAME .Nm sysctl_add_oid , .Nm sysctl_move_oid , -.Nm sysctl_remove_oid +.Nm sysctl_remove_oid , +.Nm sysctl_remove_name .Nd runtime sysctl tree manipulation .Sh SYNOPSIS .In sys/types.h @@ -62,6 +63,13 @@ .Fa int del .Fa int recurse .Fc +.Ft int +.Fo sysctl_remove_name +.Fa struct sysctl_oid *oidp +.Fa const char *name +.Fa int del +.Fa int recurse +.Fc .Sh DESCRIPTION These functions provide the interface for creating and deleting sysctl OIDs at runtime for example during the lifetime of a module. @@ -149,7 +157,25 @@ Be aware, though, that this may result i if other code sections continue to use removed subtrees. .El .Pp -Again, in most cases the programmer should use contexts, +The +.Fn sysctl_remove_name +function looks up the child node matching the +.Fa name +argument and then invokes the +.Fn sysctl_remove_oid +function on that node, passing along the +.Fa del +and +.Fa recurse +arguments. +If a node having the specified name does not exist an error code of +.Er ENOENT +is returned. +Else the error code from +.Fn sysctl_remove_oid +is returned. +.Pp +In most cases the programmer should use contexts, as described in .Xr sysctl_ctx_init 9 , to keep track of created OIDs, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
