svn commit: r283944 - in projects/em_mq: . games/grdc share/mk sys/boot/forth sys/boot/userboot/userboot sys/compat/linprocfs sys/dev/ahci sys/dev/hwpmc sys/dev/iwi sys/fs/procfs sys/kern sys/vm
Sean Bruno
sbruno at FreeBSD.org
Wed Jun 3 13:26:19 UTC 2015
Author: sbruno
Date: Wed Jun 3 13:26:15 2015
New Revision: 283944
URL: https://svnweb.freebsd.org/changeset/base/283944
Log:
MFH @283943
Modified:
projects/em_mq/Makefile.inc1
projects/em_mq/games/grdc/grdc.c
projects/em_mq/share/mk/bsd.lib.mk
projects/em_mq/sys/boot/forth/support.4th
projects/em_mq/sys/boot/userboot/userboot/conf.c
projects/em_mq/sys/compat/linprocfs/linprocfs.c
projects/em_mq/sys/dev/ahci/ahci.h
projects/em_mq/sys/dev/hwpmc/hwpmc_mod.c
projects/em_mq/sys/dev/iwi/if_iwi.c
projects/em_mq/sys/fs/procfs/procfs_map.c
projects/em_mq/sys/kern/kern_proc.c
projects/em_mq/sys/kern/sys_process.c
projects/em_mq/sys/vm/vm_object.c
projects/em_mq/sys/vm/vm_object.h
Directory Properties:
projects/em_mq/ (props changed)
projects/em_mq/share/ (props changed)
projects/em_mq/sys/ (props changed)
projects/em_mq/sys/boot/ (props changed)
Modified: projects/em_mq/Makefile.inc1
==============================================================================
--- projects/em_mq/Makefile.inc1 Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/Makefile.inc1 Wed Jun 3 13:26:15 2015 (r283944)
@@ -1366,7 +1366,8 @@ _kerberos5_bootstrap_tools= \
.if ${MK_MANDOCDB} != "no"
_libohash?= lib/libohash
_makewhatis= lib/libsqlite3 \
- usr.bin/mandoc
+ usr.bin/mandoc \
+ usr.bin/gzip
${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
.else
_makewhatis=usr.bin/makewhatis
Modified: projects/em_mq/games/grdc/grdc.c
==============================================================================
--- projects/em_mq/games/grdc/grdc.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/games/grdc/grdc.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -150,14 +150,14 @@ main(int argc, char *argv[])
set(tm->tm_min/10, 14);
if (t12) {
- if (tm->tm_hour > 12) {
- tm->tm_hour -= 12;
- mvaddstr(YBASE + 5, XBASE + 52, "PM");
- } else {
+ if (tm->tm_hour < 12) {
if (tm->tm_hour == 0)
tm->tm_hour = 12;
-
mvaddstr(YBASE + 5, XBASE + 52, "AM");
+ } else {
+ if (tm->tm_hour > 12)
+ tm->tm_hour -= 12;
+ mvaddstr(YBASE + 5, XBASE + 52, "PM");
}
}
Modified: projects/em_mq/share/mk/bsd.lib.mk
==============================================================================
--- projects/em_mq/share/mk/bsd.lib.mk Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/share/mk/bsd.lib.mk Wed Jun 3 13:26:15 2015 (r283944)
@@ -169,7 +169,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a
lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+ ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
@@ -183,7 +183,7 @@ NOPATH_FILES+= ${POBJS}
lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+ ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
@@ -240,7 +240,7 @@ _LIBS+= lib${LIB_PRIVATE}${LIB}_pic.a
lib${LIB_PRIVATE}${LIB}_pic.a: ${SOBJS}
@${ECHO} building special pic ${LIB} library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
+ ${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
Modified: projects/em_mq/sys/boot/forth/support.4th
==============================================================================
--- projects/em_mq/sys/boot/forth/support.4th Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/boot/forth/support.4th Wed Jun 3 13:26:15 2015 (r283944)
@@ -1437,12 +1437,12 @@ also builtins
abort" Unable to load a kernel!"
;
-: load_xen ( -- )
+: load_xen ( -- flag )
s" xen_kernel" getenv dup -1 <> if
- 1 1 load
+ 1 1 load ( c-addr/u flag N -- flag )
else
drop
- 0
+ 0 ( -1 -- flag )
then
;
Modified: projects/em_mq/sys/boot/userboot/userboot/conf.c
==============================================================================
--- projects/em_mq/sys/boot/userboot/userboot/conf.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/boot/userboot/userboot/conf.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -65,10 +65,11 @@ struct fs_ops *file_system[] = {
&host_fsops,
&ufs_fsops,
&cd9660_fsops,
- &gzipfs_fsops,
#if defined(USERBOOT_ZFS_SUPPORT)
&zfs_fsops,
#endif
+ &gzipfs_fsops,
+ &bzipfs_fsops,
NULL
};
Modified: projects/em_mq/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- projects/em_mq/sys/compat/linprocfs/linprocfs.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/compat/linprocfs/linprocfs.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -1025,20 +1025,16 @@ linprocfs_doprocmaps(PFS_FILL_ARGS)
ino = 0;
if (lobj) {
off = IDX_TO_OFF(lobj->size);
- if (lobj->type == OBJT_VNODE) {
- vp = lobj->handle;
- if (vp)
- vref(vp);
- }
- else
- vp = NULL;
+ vp = vm_object_vnode(lobj);
+ if (vp != NULL)
+ vref(vp);
if (lobj != obj)
VM_OBJECT_RUNLOCK(lobj);
flags = obj->flags;
ref_count = obj->ref_count;
shadow_count = obj->shadow_count;
VM_OBJECT_RUNLOCK(obj);
- if (vp) {
+ if (vp != NULL) {
vn_fullpath(td, vp, &name, &freename);
vn_lock(vp, LK_SHARED | LK_RETRY);
VOP_GETATTR(vp, &vat, td->td_ucred);
Modified: projects/em_mq/sys/dev/ahci/ahci.h
==============================================================================
--- projects/em_mq/sys/dev/ahci/ahci.h Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/dev/ahci/ahci.h Wed Jun 3 13:26:15 2015 (r283944)
@@ -578,7 +578,7 @@ enum ahci_err_type {
#define AHCI_Q_RESTORE_CAP 0x00080000
#define AHCI_Q_BIT_STRING \
- "\021" \
+ "\020" \
"\001NOFORCE" \
"\002NOPMP" \
"\003NONCQ" \
Modified: projects/em_mq/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- projects/em_mq/sys/dev/hwpmc/hwpmc_mod.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/dev/hwpmc/hwpmc_mod.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -1655,7 +1655,8 @@ pmc_log_process_mappings(struct pmc_owne
continue;
}
- if (lobj->type != OBJT_VNODE || lobj->handle == NULL) {
+ vp = vm_object_vnode(lobj);
+ if (vp == NULL) {
if (lobj != obj)
VM_OBJECT_RUNLOCK(lobj);
VM_OBJECT_RUNLOCK(obj);
@@ -1667,7 +1668,7 @@ pmc_log_process_mappings(struct pmc_owne
* vnode, so we don't emit redundant MAP-IN
* directives.
*/
- if (entry->start == last_end && lobj->handle == last_vp) {
+ if (entry->start == last_end && vp == last_vp) {
last_end = entry->end;
if (lobj != obj)
VM_OBJECT_RUNLOCK(lobj);
@@ -1690,7 +1691,6 @@ pmc_log_process_mappings(struct pmc_owne
last_timestamp = map->timestamp;
vm_map_unlock_read(map);
- vp = lobj->handle;
vref(vp);
if (lobj != obj)
VM_OBJECT_RUNLOCK(lobj);
Modified: projects/em_mq/sys/dev/iwi/if_iwi.c
==============================================================================
--- projects/em_mq/sys/dev/iwi/if_iwi.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/dev/iwi/if_iwi.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -154,7 +154,7 @@ static void iwi_node_free(struct ieee802
static void iwi_media_status(struct ifnet *, struct ifmediareq *);
static int iwi_newstate(struct ieee80211vap *, enum ieee80211_state, int);
static void iwi_wme_init(struct iwi_softc *);
-static int iwi_wme_setparams(struct iwi_softc *, struct ieee80211com *);
+static int iwi_wme_setparams(struct iwi_softc *);
static void iwi_update_wme(void *, int);
static int iwi_wme_update(struct ieee80211com *);
static uint16_t iwi_read_prom_word(struct iwi_softc *, uint8_t);
@@ -1059,8 +1059,9 @@ iwi_wme_init(struct iwi_softc *sc)
}
static int
-iwi_wme_setparams(struct iwi_softc *sc, struct ieee80211com *ic)
+iwi_wme_setparams(struct iwi_softc *sc)
{
+ struct ieee80211com *ic = sc->sc_ifp->if_l2com;
const struct wmeParams *wmep;
int ac;
@@ -1083,12 +1084,11 @@ iwi_wme_setparams(struct iwi_softc *sc,
static void
iwi_update_wme(void *arg, int npending)
{
- struct ieee80211com *ic = arg;
- struct iwi_softc *sc = ic->ic_ifp->if_softc;
+ struct iwi_softc *sc = arg;
IWI_LOCK_DECL;
IWI_LOCK(sc);
- (void) iwi_wme_setparams(sc, ic);
+ (void) iwi_wme_setparams(sc);
IWI_UNLOCK(sc);
}
@@ -2947,7 +2947,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc,
if ((vap->iv_flags & IEEE80211_F_WME) && ni->ni_ies.wme_ie != NULL) {
/* NB: don't treat WME setup as failure */
- if (iwi_wme_setparams(sc, ic) == 0 && iwi_wme_setie(sc) == 0)
+ if (iwi_wme_setparams(sc) == 0 && iwi_wme_setie(sc) == 0)
assoc->policy |= htole16(IWI_POLICY_WME);
/* XXX complain on failure? */
}
Modified: projects/em_mq/sys/fs/procfs/procfs_map.c
==============================================================================
--- projects/em_mq/sys/fs/procfs/procfs_map.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/fs/procfs/procfs_map.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -159,11 +159,11 @@ procfs_doprocmap(PFS_FILL_ARGS)
freepath = NULL;
fullpath = "-";
if (lobj) {
+ vp = NULL;
switch (lobj->type) {
default:
case OBJT_DEFAULT:
type = "default";
- vp = NULL;
break;
case OBJT_VNODE:
type = "vnode";
@@ -171,13 +171,19 @@ procfs_doprocmap(PFS_FILL_ARGS)
vref(vp);
break;
case OBJT_SWAP:
- type = "swap";
- vp = NULL;
+ if ((lobj->flags & OBJ_TMPFS_NODE) != 0) {
+ type = "vnode";
+ if ((lobj->flags & OBJ_TMPFS) != 0) {
+ vp = lobj->un_pager.swp.swp_tmpfs;
+ vref(vp);
+ }
+ } else {
+ type = "swap";
+ }
break;
case OBJT_SG:
case OBJT_DEVICE:
type = "device";
- vp = NULL;
break;
}
if (lobj != obj)
Modified: projects/em_mq/sys/kern/kern_proc.c
==============================================================================
--- projects/em_mq/sys/kern/kern_proc.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/kern/kern_proc.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -2113,7 +2113,15 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_A
vref(vp);
break;
case OBJT_SWAP:
- kve->kve_type = KVME_TYPE_SWAP;
+ if ((lobj->flags & OBJ_TMPFS_NODE) != 0) {
+ kve->kve_type = KVME_TYPE_VNODE;
+ if ((lobj->flags & OBJ_TMPFS) != 0) {
+ vp = lobj->un_pager.swp.swp_tmpfs;
+ vref(vp);
+ }
+ } else {
+ kve->kve_type = KVME_TYPE_SWAP;
+ }
break;
case OBJT_DEVICE:
kve->kve_type = KVME_TYPE_DEVICE;
@@ -2339,7 +2347,15 @@ kern_proc_vmmap_out(struct proc *p, stru
vref(vp);
break;
case OBJT_SWAP:
- kve->kve_type = KVME_TYPE_SWAP;
+ if ((lobj->flags & OBJ_TMPFS_NODE) != 0) {
+ kve->kve_type = KVME_TYPE_VNODE;
+ if ((lobj->flags & OBJ_TMPFS) != 0) {
+ vp = lobj->un_pager.swp.swp_tmpfs;
+ vref(vp);
+ }
+ } else {
+ kve->kve_type = KVME_TYPE_SWAP;
+ }
break;
case OBJT_DEVICE:
kve->kve_type = KVME_TYPE_DEVICE;
Modified: projects/em_mq/sys/kern/sys_process.c
==============================================================================
--- projects/em_mq/sys/kern/sys_process.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/kern/sys_process.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -402,7 +402,7 @@ ptrace_vm_entry(struct thread *td, struc
lobj = tobj;
pve->pve_offset += tobj->backing_object_offset;
}
- vp = (lobj->type == OBJT_VNODE) ? lobj->handle : NULL;
+ vp = vm_object_vnode(lobj);
if (vp != NULL)
vref(vp);
if (lobj != obj)
Modified: projects/em_mq/sys/vm/vm_object.c
==============================================================================
--- projects/em_mq/sys/vm/vm_object.c Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/vm/vm_object.c Wed Jun 3 13:26:15 2015 (r283944)
@@ -2287,6 +2287,18 @@ next_page:
}
}
+struct vnode *
+vm_object_vnode(vm_object_t object)
+{
+
+ VM_OBJECT_ASSERT_LOCKED(object);
+ if (object->type == OBJT_VNODE)
+ return (object->handle);
+ if (object->type == OBJT_SWAP && (object->flags & OBJ_TMPFS) != 0)
+ return (object->un_pager.swp.swp_tmpfs);
+ return (NULL);
+}
+
static int
sysctl_vm_object_list(SYSCTL_HANDLER_ARGS)
{
Modified: projects/em_mq/sys/vm/vm_object.h
==============================================================================
--- projects/em_mq/sys/vm/vm_object.h Wed Jun 3 13:12:08 2015 (r283943)
+++ projects/em_mq/sys/vm/vm_object.h Wed Jun 3 13:26:15 2015 (r283944)
@@ -322,6 +322,7 @@ boolean_t vm_object_sync(vm_object_t, vm
boolean_t);
void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
vm_size_t length, uint8_t queue);
+struct vnode *vm_object_vnode(vm_object_t object);
#endif /* _KERNEL */
#endif /* _VM_OBJECT_ */
More information about the svn-src-projects
mailing list