svn commit: r238546 - head/usr.sbin/lpr/common_source
Author: jh
Date: Tue Jul 17 09:31:05 2012
New Revision: 238546
URL: http://svn.freebsd.org/changeset/base/238546
Log:
Remove trailing whitespace.
MFC after:2 weeks
Modified:
head/usr.sbin/lpr/common_source/common.c
Modified: head/usr.sbin/lpr/common_source/common.c
==
--- head/usr.sbin/lpr/common_source/common.cTue Jul 17 03:18:12 2012
(r238545)
+++ head/usr.sbin/lpr/common_source/common.cTue Jul 17 09:31:05 2012
(r238546)
@@ -136,7 +136,7 @@ getq(const struct printer *pp, struct jo
/*
* Estimate the array size by taking the size of the directory file
-* and dividing it by a multiple of the minimum size entry.
+* and dividing it by a multiple of the minimum size entry.
*/
arraysz = (stbuf.st_size / 24);
queue = (struct jobqueue **)malloc(arraysz * sizeof(struct jobqueue *));
@@ -641,7 +641,7 @@ trstat_write(struct printer *pp, tr_send
* secs= - seconds it took to transfer the file
* bytes= - number of bytes transfered (ie, "bytecount")
* bps=e - Bytes/sec (if the transfer was "big enough"
-* for this to be useful)
+* for this to be useful)
* ! top= - type of printer (if the type is defined in
* printcap, and if this statline is for sending
* a file to that ptr)
@@ -719,7 +719,7 @@ trstat_write(struct printer *pp, tr_send
if (remspace > 1) {
strcpy(eostat, "\n");
} else {
- /* probably should back up to just before the final " x=".. */
+ /* probably should back up to just before the final " x=".. */
strcpy(statline+STATLINE_SIZE-2, "\n");
}
statfile = open(statfname, O_WRONLY|O_APPEND, 0664);
@@ -732,7 +732,7 @@ trstat_write(struct printer *pp, tr_send
close(statfile);
return;
-#undef UPD_EOSTAT
+#undef UPD_EOSTAT
}
#include
___
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: r238547 - head/usr.sbin/lpr/common_source
Author: jh Date: Tue Jul 17 09:34:52 2012 New Revision: 238547 URL: http://svn.freebsd.org/changeset/base/238547 Log: Make sure that arraysz is initialized to a value larger than zero. arraysz could get initialized to zero on ZFS because ZFS reports directory sizes differently compared to UFS. PR: bin/169493 Tested by:swills MFC after:2 weeks Modified: head/usr.sbin/lpr/common_source/common.c Modified: head/usr.sbin/lpr/common_source/common.c == --- head/usr.sbin/lpr/common_source/common.cTue Jul 17 09:31:05 2012 (r238546) +++ head/usr.sbin/lpr/common_source/common.cTue Jul 17 09:34:52 2012 (r238547) @@ -139,6 +139,8 @@ getq(const struct printer *pp, struct jo * and dividing it by a multiple of the minimum size entry. */ arraysz = (stbuf.st_size / 24); + if (arraysz < 16) + arraysz = 16; queue = (struct jobqueue **)malloc(arraysz * sizeof(struct jobqueue *)); if (queue == NULL) goto errdone; ___ 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: r238548 - stable/9/sys/netinet
Author: tuexen
Date: Tue Jul 17 11:18:39 2012
New Revision: 238548
URL: http://svn.freebsd.org/changeset/base/238548
Log:
MFC r238454:
Bugfix: Send up a COMM UP notification for active 1-to-1 style sockets
also in the case where the assoc comes up due to a remotely
started handshake (collision case).
Approved by: re@
Modified:
stable/9/sys/netinet/sctp_input.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_input.c
==
--- stable/9/sys/netinet/sctp_input.c Tue Jul 17 09:34:52 2012
(r238547)
+++ stable/9/sys/netinet/sctp_input.c Tue Jul 17 11:18:39 2012
(r238548)
@@ -2912,14 +2912,12 @@ sctp_handle_cookie_echo(struct mbuf *m,
return (m);
}
}
- if ((*inp_p)->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) {
- if (notification) {
- sctp_ulp_notify(notification, *stcb, 0, NULL,
SCTP_SO_NOT_LOCKED);
- }
- if (send_int_conf) {
- sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED,
- (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED);
- }
+ if (notification) {
+ sctp_ulp_notify(notification, *stcb, 0, NULL,
SCTP_SO_NOT_LOCKED);
+ }
+ if (send_int_conf) {
+ sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED,
+ (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED);
}
return (m);
}
___
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: r238549 - stable/9/sys/netinet
Author: tuexen
Date: Tue Jul 17 11:33:24 2012
New Revision: 238549
URL: http://svn.freebsd.org/changeset/base/238549
Log:
MFC r238458:
Provide the correct notification type (SCTP_SEND_FAILED_EVENT)
for unsent messages.
Approved by: re@
Modified:
stable/9/sys/netinet/sctputil.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctputil.c
==
--- stable/9/sys/netinet/sctputil.c Tue Jul 17 11:18:39 2012
(r238548)
+++ stable/9/sys/netinet/sctputil.c Tue Jul 17 11:33:24 2012
(r238549)
@@ -2951,7 +2951,7 @@ sctp_notify_send_failed2(struct sctp_tcb
SCTP_BUF_LEN(m_notify) = 0;
if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb,
SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
ssfe = mtod(m_notify, struct sctp_send_failed_event *);
- ssfe->ssfe_type = SCTP_SEND_FAILED;
+ ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
ssfe->ssfe_flags = SCTP_DATA_UNSENT;
ssfe->ssfe_length = length;
ssfe->ssfe_error = error;
___
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: r238550 - head/sys/netinet
Author: tuexen
Date: Tue Jul 17 13:03:47 2012
New Revision: 238550
URL: http://svn.freebsd.org/changeset/base/238550
Log:
Fix a refcount bug when freeing an association.
While there: Change code to be consistent.
Discussed with rrs@.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_pcb.c
==
--- head/sys/netinet/sctp_pcb.c Tue Jul 17 11:33:24 2012(r238549)
+++ head/sys/netinet/sctp_pcb.c Tue Jul 17 13:03:47 2012(r238550)
@@ -4875,6 +4875,7 @@ sctp_free_assoc(struct sctp_inpcb *inp,
/* now clean up any chunks here */
TAILQ_FOREACH_SAFE(sp, &outs->outqueue, next, nsp) {
TAILQ_REMOVE(&outs->outqueue, sp, next);
+ sctp_free_spbufspace(stcb, asoc, sp);
if (sp->data) {
if (so) {
/* Still an open socket - report */
@@ -4885,19 +4886,14 @@ sctp_free_assoc(struct sctp_inpcb *inp,
sctp_m_freem(sp->data);
sp->data = NULL;
sp->tail_mbuf = NULL;
+ sp->length = 0;
}
}
if (sp->net) {
sctp_free_remote_addr(sp->net);
sp->net = NULL;
}
- sctp_free_spbufspace(stcb, asoc, sp);
- if (sp->holds_key_ref)
- sctp_auth_key_release(stcb, sp->auth_keyid,
SCTP_SO_LOCKED);
- /* Free the zone stuff */
- SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_strmoq), sp);
- SCTP_DECR_STRMOQ_COUNT();
- /* sa_ignore FREED_MEMORY */
+ sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED);
}
}
/* sa_ignore FREED_MEMORY */
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Tue Jul 17 11:33:24 2012(r238549)
+++ head/sys/netinet/sctputil.c Tue Jul 17 13:03:47 2012(r238550)
@@ -3774,6 +3774,8 @@ sctp_report_all_outbound(struct sctp_tcb
if (sp->data) {
sctp_m_freem(sp->data);
sp->data = NULL;
+ sp->tail_mbuf = NULL;
+ sp->length = 0;
}
}
if (sp->net) {
@@ -4833,7 +4835,7 @@ sctp_release_pr_sctp_chunk(struct sctp_t
/*
* Pull any data to free up the SB
* and allow sender to "add more"
-* whilc we will throw away :-)
+* while we will throw away :-)
*/
sctp_free_spbufspace(stcb, &stcb->asoc,
sp);
@@ -4841,9 +4843,9 @@ sctp_release_pr_sctp_chunk(struct sctp_t
do_wakeup_routine = 1;
sp->some_taken = 1;
sctp_m_freem(sp->data);
- sp->length = 0;
sp->data = NULL;
sp->tail_mbuf = NULL;
+ sp->length = 0;
}
break;
}
___
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: r238551 - head/sys/dev/usb/controller
Author: mav
Date: Tue Jul 17 14:03:04 2012
New Revision: 238551
URL: http://svn.freebsd.org/changeset/base/238551
Log:
For Intel Panther/Lynx Point USB 3.0 xHCI controllers enable SuperSpeed USB
capability and reroute USB 2.0 ports to the xHCI controller.
Reviewed by: hselasky
Modified:
head/sys/dev/usb/controller/xhci_pci.c
head/sys/dev/usb/controller/xhcireg.h
Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c Tue Jul 17 13:03:47 2012
(r238550)
+++ head/sys/dev/usb/controller/xhci_pci.c Tue Jul 17 14:03:04 2012
(r238551)
@@ -101,6 +101,8 @@ xhci_pci_match(device_t self)
case 0x1e318086:
return ("Intel Panther Point USB 3.0 controller");
+ case 0x8c318086:
+ return ("Intel Lynx Point USB 3.0 controller");
default:
break;
@@ -245,6 +247,7 @@ static int
xhci_pci_take_controller(device_t self)
{
struct xhci_softc *sc = device_get_softc(self);
+ uint32_t device_id = pci_get_devid(self);
uint32_t cparams;
uint32_t eecp;
uint32_t eec;
@@ -285,5 +288,13 @@ xhci_pci_take_controller(device_t self)
usb_pause_mtx(NULL, hz / 100); /* wait 10ms */
}
}
+
+ /* On Intel chipsets reroute ports from EHCI to XHCI controller. */
+ if (device_id == 0x1e318086 /* Panther Point */ ||
+ device_id == 0x8c318086 /* Lynx Point */) {
+ pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 0x,
4);
+ pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, 0x, 4);
+ }
+
return (0);
}
Modified: head/sys/dev/usb/controller/xhcireg.h
==
--- head/sys/dev/usb/controller/xhcireg.h Tue Jul 17 13:03:47 2012
(r238550)
+++ head/sys/dev/usb/controller/xhcireg.h Tue Jul 17 14:03:04 2012
(r238551)
@@ -34,6 +34,9 @@
#definePCI_USB_REV_3_0 0x30/* USB 3.0 */
#definePCI_XHCI_FLADJ 0x61/* RW frame length adjust */
+#definePCI_XHCI_INTEL_XUSB2PR 0xD0/* Intel USB2 Port Routing */
+#definePCI_XHCI_INTEL_USB3_PSSEN 0xD8 /* Intel USB3 Port SuperSpeed
Enable */
+
/* XHCI capability registers */
#defineXHCI_CAPLENGTH 0x00/* RO capability */
#defineXHCI_RESERVED 0x01/* Reserved */
___
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: r238552 - in head/sys/cddl/dev/dtrace: amd64 i386
Author: gnn Date: Tue Jul 17 14:36:40 2012 New Revision: 238552 URL: http://svn.freebsd.org/changeset/base/238552 Log: Change UL to ULL since time is 32 bits. Pointed out by: avg@ MFC after:2 weeks Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c == --- head/sys/cddl/dev/dtrace/amd64/dtrace_subr.cTue Jul 17 14:03:04 2012(r238551) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_subr.cTue Jul 17 14:36:40 2012(r238552) @@ -467,7 +467,7 @@ dtrace_gethrestime(void) dtrace_getnanotime(¤t_time); - return (current_time.tv_sec * 10UL + current_time.tv_nsec); + return (current_time.tv_sec * 10ULL + current_time.tv_nsec); } /* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */ Modified: head/sys/cddl/dev/dtrace/i386/dtrace_subr.c == --- head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Tue Jul 17 14:03:04 2012 (r238551) +++ head/sys/cddl/dev/dtrace/i386/dtrace_subr.c Tue Jul 17 14:36:40 2012 (r238552) @@ -468,7 +468,7 @@ dtrace_gethrestime(void) dtrace_getnanotime(¤t_time); - return (current_time.tv_sec * 10UL + current_time.tv_nsec); + return (current_time.tv_sec * 10ULL + current_time.tv_nsec); } /* Function to handle DTrace traps during probes. See i386/i386/trap.c */ ___ 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: r238553 - stable/8/sys/fs/tmpfs
Author: delphij
Date: Tue Jul 17 17:34:48 2012
New Revision: 238553
URL: http://svn.freebsd.org/changeset/base/238553
Log:
MFC the following revisions per request from gleb@:
r197953: Add locking around access to parent node, and bail out when
the parent node is already freed rather than panicking the system.
r227822: Avoid panics from recursive rename operations. Not a perfect
patch but good enough for now.
r232959: Don't enforce LK_RETRY to get existing vnode in
tmpfs_alloc_vp().
Doomed vnode is hardly of any use here, besides all callers handle error
case. vfs_hash_get() does the same.
Don't mess with vnode holdcount, vget() takes care of it already.
r232960: Prevent tmpfs_rename() deadlock in a way similar to UFS
Unlock vnodes and try to lock them one by one. Relookup fvp and tvp.
Modified:
stable/8/sys/fs/tmpfs/tmpfs.h
stable/8/sys/fs/tmpfs/tmpfs_subr.c
stable/8/sys/fs/tmpfs/tmpfs_vnops.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/fs/tmpfs/tmpfs.h
==
--- stable/8/sys/fs/tmpfs/tmpfs.h Tue Jul 17 14:36:40 2012
(r238552)
+++ stable/8/sys/fs/tmpfs/tmpfs.h Tue Jul 17 17:34:48 2012
(r238553)
@@ -304,10 +304,30 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
#define TMPFS_NODE_LOCK(node) mtx_lock(&(node)->tn_interlock)
#define TMPFS_NODE_UNLOCK(node) mtx_unlock(&(node)->tn_interlock)
-#defineTMPFS_NODE_MTX(node) (&(node)->tn_interlock)
+#define TMPFS_NODE_MTX(node) (&(node)->tn_interlock)
+
+#ifdef INVARIANTS
+#define TMPFS_ASSERT_LOCKED(node) do { \
+ MPASS(node != NULL);\
+ MPASS(node->tn_vnode != NULL); \
+ if (!VOP_ISLOCKED(node->tn_vnode) &&\
+ !mtx_owned(TMPFS_NODE_MTX(node))) \
+ panic("tmpfs: node is not locked: %p", node); \
+ } while (0)
+#define TMPFS_ASSERT_ELOCKED(node) do {
\
+ MPASS((node) != NULL); \
+ MPASS((node)->tn_vnode != NULL);\
+ mtx_assert(TMPFS_NODE_MTX(node), MA_OWNED); \
+ ASSERT_VOP_LOCKED((node)->tn_vnode, "tmpfs"); \
+ } while (0)
+#else
+#define TMPFS_ASSERT_LOCKED(node) (void)0
+#define TMPFS_ASSERT_ELOCKED(node) (void)0
+#endif
#define TMPFS_VNODE_ALLOCATING 1
#define TMPFS_VNODE_WANT 2
+#define TMPFS_VNODE_DOOMED 4
/* - */
/*
Modified: stable/8/sys/fs/tmpfs/tmpfs_subr.c
==
--- stable/8/sys/fs/tmpfs/tmpfs_subr.c Tue Jul 17 14:36:40 2012
(r238552)
+++ stable/8/sys/fs/tmpfs/tmpfs_subr.c Tue Jul 17 17:34:48 2012
(r238553)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -55,6 +56,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+SYSCTL_NODE(_vfs, OID_AUTO, tmpfs, CTLFLAG_RW, 0, "tmpfs file system");
+
/* - */
/*
@@ -124,7 +127,9 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp
nnode->tn_dir.tn_readdir_lastn = 0;
nnode->tn_dir.tn_readdir_lastp = NULL;
nnode->tn_links++;
+ TMPFS_NODE_LOCK(nnode->tn_dir.tn_parent);
nnode->tn_dir.tn_parent->tn_links++;
+ TMPFS_NODE_UNLOCK(nnode->tn_dir.tn_parent);
break;
case VFIFO:
@@ -187,6 +192,7 @@ tmpfs_free_node(struct tmpfs_mount *tmp,
#ifdef INVARIANTS
TMPFS_NODE_LOCK(node);
MPASS(node->tn_vnode == NULL);
+ MPASS((node->tn_vpstate & TMPFS_VNODE_ALLOCATING) == 0);
TMPFS_NODE_UNLOCK(node);
#endif
@@ -314,11 +320,14 @@ tmpfs_alloc_vp(struct mount *mp, struct
loop:
TMPFS_NODE_LOCK(node);
if ((vp = node->tn_vnode) != NULL) {
+ MPASS((node->tn_vpstate & TMPFS_VNODE_DOOMED) == 0);
VI_LOCK(vp);
TMPFS_NODE_UNLOCK(node);
- vholdl(vp);
- (void) vget(vp, lkflag | LK_INTERLOCK | LK_RETRY, curthread);
- vdrop(vp);
+ error = vget(vp, lkflag | LK_INTERLOCK, curthread);
+ if (error != 0) {
+ vp = NULL;
+ goto out;
+ }
/*
* Make sure the vnode is still there after
@@ -332,6 +341,14 @@ loop:
goto out;
}
+ if ((node->tn_vpstate & TMPFS_VNODE_DOOMED) ||
+ (node->tn_type == VDIR && node->tn_dir.tn_parent == NULL)) {
+ TMPFS_NODE_UNLOCK(
svn commit: r238554 - stable/9/contrib/llvm/tools/clang/lib/Sema
Author: dim
Date: Tue Jul 17 18:04:34 2012
New Revision: 238554
URL: http://svn.freebsd.org/changeset/base/238554
Log:
MFC r238429:
Pull in r159895 from upstream clang trunk:
When marking virtual functions as used for a class' vtable, mark all
functions
which will appear in the vtable as used, not just those ones which were
declared within the class itself. Fixes an issue reported as comment#3 in
PR12763 -- we sometimes assert in codegen if we try to emit a reference to a
function declaration which we've not marked as referenced. This also matches
gcc's observed behavior.
This should fix clang assertions when building certain components of the
LibreOffice port.
Approved by: re (kib)
Modified:
stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
Directory Properties:
stable/9/contrib/llvm/ (props changed)
stable/9/contrib/llvm/tools/clang/ (props changed)
Modified: stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
==
--- stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Tue Jul 17
17:34:48 2012(r238553)
+++ stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Tue Jul 17
18:04:34 2012(r238554)
@@ -10937,14 +10937,23 @@ bool Sema::DefineUsedVTables() {
void Sema::MarkVirtualMembersReferenced(SourceLocation Loc,
const CXXRecordDecl *RD) {
- for (CXXRecordDecl::method_iterator i = RD->method_begin(),
- e = RD->method_end(); i != e; ++i) {
-CXXMethodDecl *MD = *i;
-
-// C++ [basic.def.odr]p2:
-// [...] A virtual member function is used if it is not pure. [...]
-if (MD->isVirtual() && !MD->isPure())
- MarkFunctionReferenced(Loc, MD);
+ // Mark all functions which will appear in RD's vtable as used.
+ CXXFinalOverriderMap FinalOverriders;
+ RD->getFinalOverriders(FinalOverriders);
+ for (CXXFinalOverriderMap::const_iterator I = FinalOverriders.begin(),
+E = FinalOverriders.end();
+ I != E; ++I) {
+for (OverridingMethods::const_iterator OI = I->second.begin(),
+ OE = I->second.end();
+ OI != OE; ++OI) {
+ assert(OI->second.size() > 0 && "no final overrider");
+ CXXMethodDecl *Overrider = OI->second.front().Method;
+
+ // C++ [basic.def.odr]p2:
+ // [...] A virtual member function is used if it is not pure. [...]
+ if (!Overrider->isPure())
+MarkFunctionReferenced(Loc, Overrider);
+}
}
// Only classes that have virtual bases need a VTT.
___
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: r238555 - stable/9/sys/dev/fb
Author: kib
Date: Tue Jul 17 19:00:46 2012
New Revision: 238555
URL: http://svn.freebsd.org/changeset/base/238555
Log:
MFC r237203,r237223 (by phk):
Fix writes to the video memory of the VGA to always use half-word sized
writes.
Approved by:re (hrs), phk
Modified:
stable/9/sys/dev/fb/fbreg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/fb/fbreg.h
==
--- stable/9/sys/dev/fb/fbreg.h Tue Jul 17 18:04:34 2012(r238554)
+++ stable/9/sys/dev/fb/fbreg.h Tue Jul 17 19:00:46 2012(r238555)
@@ -35,9 +35,17 @@
/* some macros */
#if defined(__amd64__) || defined(__i386__)
-#define bcopy_io(s, d, c) bcopy((void *)(s), (void *)(d), (c))
-#define bcopy_toio(s, d, c)bcopy((void *)(s), (void *)(d), (c))
-#define bcopy_fromio(s, d, c) bcopy((void *)(s), (void *)(d), (c))
+
+static __inline void
+copyw(uint16_t *src, uint16_t *dst, size_t size)
+{
+ size >>= 1;
+ while (size--)
+ *dst++ = *src++;
+}
+#define bcopy_io(s, d, c) copyw((void*)(s), (void*)(d), (c))
+#define bcopy_toio(s, d, c)copyw((void*)(s), (void*)(d), (c))
+#define bcopy_fromio(s, d, c) copyw((void*)(s), (void*)(d), (c))
#define bzero_io(d, c) bzero((void *)(d), (c))
#define fill_io(p, d, c) fill((p), (void *)(d), (c))
#define fillw_io(p, d, c) fillw((p), (void *)(d), (c))
___
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: r238556 - stable/8/sys/dev/fb
Author: kib
Date: Tue Jul 17 19:14:12 2012
New Revision: 238556
URL: http://svn.freebsd.org/changeset/base/238556
Log:
MFC r237203,r237223 (by phk):
Fix writes to the video memory of the VGA to always use half-word sized
writes.
Approved by:phk
Modified:
stable/8/sys/dev/fb/fbreg.h
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/fb/fbreg.h
==
--- stable/8/sys/dev/fb/fbreg.h Tue Jul 17 19:00:46 2012(r238555)
+++ stable/8/sys/dev/fb/fbreg.h Tue Jul 17 19:14:12 2012(r238556)
@@ -35,9 +35,17 @@
/* some macros */
#if defined(__amd64__) || defined(__i386__)
-#define bcopy_io(s, d, c) bcopy((void *)(s), (void *)(d), (c))
-#define bcopy_toio(s, d, c)bcopy((void *)(s), (void *)(d), (c))
-#define bcopy_fromio(s, d, c) bcopy((void *)(s), (void *)(d), (c))
+
+static __inline void
+copyw(uint16_t *src, uint16_t *dst, size_t size)
+{
+ size >>= 1;
+ while (size--)
+ *dst++ = *src++;
+}
+#define bcopy_io(s, d, c) copyw((void*)(s), (void*)(d), (c))
+#define bcopy_toio(s, d, c)copyw((void*)(s), (void*)(d), (c))
+#define bcopy_fromio(s, d, c) copyw((void*)(s), (void*)(d), (c))
#define bzero_io(d, c) bzero((void *)(d), (c))
#define fill_io(p, d, c) fill((p), (void *)(d), (c))
#define fillw_io(p, d, c) fillw((p), (void *)(d), (c))
___
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: r238557 - stable/9/sys/netinet/ipfw
Author: melifaro Date: Tue Jul 17 19:29:32 2012 New Revision: 238557 URL: http://svn.freebsd.org/changeset/base/238557 Log: MFC r237479, r238265 Finally fix lookup (account remaining '\0') and deletion (provide valid key length for radix lookup). Submitted by:Ihor Kaharlichenko (prev version) Approved by: re(hrs), kib(mentor) Sponsored by:Shtorm ISP Modified: stable/9/sys/netinet/ipfw/ip_fw_table.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/ipfw/ip_fw_table.c == --- stable/9/sys/netinet/ipfw/ip_fw_table.c Tue Jul 17 19:14:12 2012 (r238556) +++ stable/9/sys/netinet/ipfw/ip_fw_table.c Tue Jul 17 19:29:32 2012 (r238557) @@ -344,9 +344,12 @@ ipfw_del_table_entry(struct ip_fw_chain struct xaddr_iface ifname, ifmask; memset(&ifname, 0, sizeof(ifname)); + /* Include last \0 into comparison */ + mlen++; + /* Set 'total' structure length */ - KEY_LEN(ifname) = mlen; - KEY_LEN(ifmask) = mlen; + KEY_LEN(ifname) = KEY_LEN_IFACE + mlen; + KEY_LEN(ifmask) = KEY_LEN_IFACE + mlen; /* Assume direct match */ /* FIXME: Add interface pattern matching */ #if 0 @@ -568,7 +571,8 @@ ipfw_lookup_table_extended(struct ip_fw_ break; case IPFW_TABLE_INTERFACE: - KEY_LEN(iface) = strlcpy(iface.ifname, (char *)paddr, IF_NAMESIZE); + KEY_LEN(iface) = KEY_LEN_IFACE + + strlcpy(iface.ifname, (char *)paddr, IF_NAMESIZE) + 1; /* Assume direct match */ /* FIXME: Add interface pattern matching */ xent = (struct table_xentry *)(rnh->rnh_lookup(&iface, NULL, rnh)); ___ 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: r238558 - in head/cddl/contrib/opensolaris: cmd/dtrace/test/tst/common/include cmd/dtrace/test/tst/common/pragma lib/libdtrace/common
Author: pfg
Date: Tue Jul 17 19:57:34 2012
New Revision: 238558
URL: http://svn.freebsd.org/changeset/base/238558
Log:
Dtrace: improve handling of library paths.
Merge changes from illumos
906 dtrace depends_on pragma should search all library paths, not just the
current one
949 dtrace should only include the first instance of a library found on
its library path
Illumos Revisions:13353:936a1e45726c
13354:2b2c36a81512
Reference:
https://www.illumos.org/issues/906
https://www.illumos.org/issues/949
Tested by:Fabian Keil
Obtained from:Illumos
MFC after:3 weeks
Added:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/
- copied from r238552,
vendor/illumos/dist/cmd/dtrace/test/tst/common/include/
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
- copied unchanged from r238552,
vendor/illumos/dist/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
Copied:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
(from r238552,
vendor/illumos/dist/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh
Tue Jul 17 19:57:34 2012(r238558, copy of r238552,
vendor/illumos/dist/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh)
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Joyent Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Test to catch that we properly look for libraries dependencies in
+# our full library parth
+#
+
+if [ $# != 1 ]; then
+ echo expected one argument: '<'dtrace-path'>'
+ exit 2
+fi
+
+libdira=${TMPDIR:-/tmp}/libdepa.$$
+libdirb=${TMPDIR:-/tmp}/libdepb.$$
+libdirc=${TMPDIR:-/tmp}/libdepc.$$
+dtrace=$1
+
+setup_libs()
+{
+mkdir $libdira
+mkdir $libdirb
+mkdir $libdirc
+cat > $libdira/liba.$$.d < $libdirb/libb.$$.d < $libdirb/libc.$$.d < $libdirb/libd.$$.d < $libdirc/libe.$$.d < $libdirc/libf.$$.d dtld_library, '/');
+ /* dt_lib_depend_add ensures this */
+ assert(end != NULL);
+ if (strcmp(end + 1, dp->d_name) == 0)
+ break;
+ }
+
+ if (dld != NULL) {
+ dt_dprintf("skipping library %s, already processed "
+ "library with the same name: %s", dp->d_name,
+ dld->dtld_library);
+ continue;
+ }
+
dtp->dt_filetag = fname;
if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0)
- goto err;
+ return (-1); /* preserve dt_errno */
rv = dt_compile(dtp, DT_CTX_DPROG,
DTRACE_PROBESPEC_NAME, NULL,
@@ -2203,7 +2221,7 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, cons
if (rv != NULL && dtp->dt_errno &&
(dtp->dt_errno != EDT_COMPILER ||
dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND)))
- goto err;
+ return (-1); /* preserve dt_errno */
if (dtp->dt_errno)
dt_dprintf("error parsing library %s: %s\n",
@@ -2214,6 +2232,27 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, cons
}
(void) closedir(dirp);
+
+ return (0);
+}
+
+/*
+ * Perform a topological sorting of all the libraries found across the entire
+ * dt_lib_path. Once sorted, compile each one in topological order to cache
its
+ * inlines and translators, etc. We silently ignore any missing directories
and
+ * oth
svn commit: r238559 - head/sys/geom
Author: ken
Date: Tue Jul 17 22:16:10 2012
New Revision: 238559
URL: http://svn.freebsd.org/changeset/base/238559
Log:
Add back spare fields consumed in r237545. It seems that these should only
be consumed to maintain backward compatibility in stable, but should not be
consumed in head.
Submitted by: trasz, attilio (indirectly)
Modified:
head/sys/geom/geom.h
Modified: head/sys/geom/geom.h
==
--- head/sys/geom/geom.hTue Jul 17 19:57:34 2012(r238558)
+++ head/sys/geom/geom.hTue Jul 17 22:16:10 2012(r238559)
@@ -110,6 +110,7 @@ struct g_class {
g_ioctl_t *ioctl;
g_provgone_t*providergone;
g_resize_t *resize;
+ void*spare1;
void*spare2;
/*
* The remaining elements are private
@@ -142,6 +143,7 @@ struct g_geom {
g_ioctl_t *ioctl;
g_provgone_t*providergone;
g_resize_t *resize;
+ void*spare0;
void*spare1;
void*softc;
unsignedflags;
___
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: r238560 - in stable/9/sys: kern sys
Author: mjg
Date: Wed Jul 18 04:52:37 2012
New Revision: 238560
URL: http://svn.freebsd.org/changeset/base/238560
Log:
MFC r238220, r238272:
Unbreak handling of descriptors opened with O_EXEC by fexecve(2).
While here return EBADF for descriptors opened for writing (previously it was
ETXTBSY).
Add fgetvp_exec function which performs appropriate checks.
==
Follow-up commit to r238220:
Pass only FEXEC (instead of FREAD|FEXEC) in fgetvp_exec. _fget has to check
for
!FWRITE anyway and may as well know about FREAD.
Make _fget code a bit more readable by converting permission checking from
if()
to switch(). Assert that correct permission flags are passed.
PR: kern/169651
In collaboration with:kib
Approved by: re (hrs), trasz (mentor)
Modified:
stable/9/sys/kern/kern_descrip.c
stable/9/sys/kern/kern_exec.c
stable/9/sys/sys/file.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/kern/kern_descrip.c
==
--- stable/9/sys/kern/kern_descrip.cTue Jul 17 22:16:10 2012
(r238559)
+++ stable/9/sys/kern/kern_descrip.cWed Jul 18 04:52:37 2012
(r238560)
@@ -2329,8 +2329,8 @@ _fget(struct thread *td, int fd, struct
struct file *fp;
#ifdef CAPABILITIES
struct file *fp_fromcap;
- int error;
#endif
+ int error;
*fpp = NULL;
if (td == NULL || (fdp = td->td_proc->p_fd) == NULL)
@@ -2369,7 +2369,7 @@ _fget(struct thread *td, int fd, struct
else
error = cap_funwrap_mmap(fp, needrights, maxprotp,
&fp_fromcap);
- if (error) {
+ if (error != 0) {
fdrop(fp, td);
return (error);
}
@@ -2394,14 +2394,30 @@ _fget(struct thread *td, int fd, struct
/*
* FREAD and FWRITE failure return EBADF as per POSIX.
-*
-* Only one flag, or 0, may be specified.
*/
- if ((flags == FREAD && (fp->f_flag & FREAD) == 0) ||
- (flags == FWRITE && (fp->f_flag & FWRITE) == 0)) {
+ error = 0;
+ switch (flags) {
+ case FREAD:
+ case FWRITE:
+ if ((fp->f_flag & flags) == 0)
+ error = EBADF;
+ break;
+ case FEXEC:
+ if ((fp->f_flag & (FREAD | FEXEC)) == 0 ||
+ ((fp->f_flag & FWRITE) != 0))
+ error = EBADF;
+ break;
+ case 0:
+ break;
+ default:
+ KASSERT(0, ("wrong flags"));
+ }
+
+ if (error != 0) {
fdrop(fp, td);
- return (EBADF);
+ return (error);
}
+
*fpp = fp;
return (0);
}
@@ -2498,6 +2514,13 @@ fgetvp_read(struct thread *td, int fd, c
return (_fgetvp(td, fd, FREAD, rights, NULL, vpp));
}
+int
+fgetvp_exec(struct thread *td, int fd, cap_rights_t rights, struct vnode **vpp)
+{
+
+ return (_fgetvp(td, fd, FEXEC, rights, NULL, vpp));
+}
+
#ifdef notyet
int
fgetvp_write(struct thread *td, int fd, cap_rights_t rights,
Modified: stable/9/sys/kern/kern_exec.c
==
--- stable/9/sys/kern/kern_exec.c Tue Jul 17 22:16:10 2012
(r238559)
+++ stable/9/sys/kern/kern_exec.c Wed Jul 18 04:52:37 2012
(r238560)
@@ -443,8 +443,10 @@ interpret:
/*
* Some might argue that CAP_READ and/or CAP_MMAP should also
* be required here; such arguments will be entertained.
+*
+* Descriptors opened only with O_EXEC or O_RDONLY are allowed.
*/
- error = fgetvp_read(td, args->fd, CAP_FEXECVE, &binvp);
+ error = fgetvp_exec(td, args->fd, CAP_FEXECVE, &binvp);
if (error)
goto exec_fail;
vfslocked = VFS_LOCK_GIANT(binvp->v_mount);
Modified: stable/9/sys/sys/file.h
==
--- stable/9/sys/sys/file.h Tue Jul 17 22:16:10 2012(r238559)
+++ stable/9/sys/sys/file.h Wed Jul 18 04:52:37 2012(r238560)
@@ -225,6 +225,8 @@ fo_chown_t invfo_chown;
void finit(struct file *, u_int, short, void *, struct fileops *);
int fgetvp(struct thread *td, int fd, cap_rights_t rights, struct vnode **vpp);
+int fgetvp_exec(struct thread *td, int fd, cap_rights_t rights,
+struct vnode **vpp);
int fgetvp_rights(struct thread *td, int fd, cap_rights_t need,
cap_rights_t *have, struct vnode **vpp);
int fgetvp_read(struct thread *td, int fd, cap_rights_t rights,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinf
svn commit: r238561 - in head/sys: conf mips/mips vm
Author: alc
Date: Wed Jul 18 05:21:34 2012
New Revision: 238561
URL: http://svn.freebsd.org/changeset/base/238561
Log:
Move what remains of vm/vm_contig.c into vm/vm_pageout.c, where similar
code resides. Rename vm_contig_grow_cache() to vm_pageout_grow_cache().
Reviewed by: kib
Deleted:
head/sys/vm/vm_contig.c
Modified:
head/sys/conf/files
head/sys/mips/mips/pmap.c
head/sys/vm/vm_kern.c
head/sys/vm/vm_pageout.c
head/sys/vm/vm_pageout.h
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Jul 18 04:52:37 2012(r238560)
+++ head/sys/conf/files Wed Jul 18 05:21:34 2012(r238561)
@@ -3551,7 +3551,6 @@ vm/sg_pager.c standard
vm/swap_pager.cstandard
vm/uma_core.c standard
vm/uma_dbg.c standard
-vm/vm_contig.c standard
vm/memguard.c optional DEBUG_MEMGUARD
vm/vm_fault.c standard
vm/vm_glue.c standard
Modified: head/sys/mips/mips/pmap.c
==
--- head/sys/mips/mips/pmap.c Wed Jul 18 04:52:37 2012(r238560)
+++ head/sys/mips/mips/pmap.c Wed Jul 18 05:21:34 2012(r238561)
@@ -1034,9 +1034,9 @@ pmap_grow_direct_page_cache()
{
#ifdef __mips_n64
- vm_contig_grow_cache(3, 0, MIPS_XKPHYS_LARGEST_PHYS);
+ vm_pageout_grow_cache(3, 0, MIPS_XKPHYS_LARGEST_PHYS);
#else
- vm_contig_grow_cache(3, 0, MIPS_KSEG0_LARGEST_PHYS);
+ vm_pageout_grow_cache(3, 0, MIPS_KSEG0_LARGEST_PHYS);
#endif
}
Modified: head/sys/vm/vm_kern.c
==
--- head/sys/vm/vm_kern.c Wed Jul 18 04:52:37 2012(r238560)
+++ head/sys/vm/vm_kern.c Wed Jul 18 05:21:34 2012(r238561)
@@ -239,7 +239,7 @@ retry:
VM_OBJECT_UNLOCK(object);
if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) {
vm_map_unlock(map);
- vm_contig_grow_cache(tries, low, high);
+ vm_pageout_grow_cache(tries, low, high);
vm_map_lock(map);
VM_OBJECT_LOCK(object);
tries++;
@@ -313,7 +313,7 @@ retry:
VM_OBJECT_UNLOCK(object);
if (tries < ((flags & M_NOWAIT) != 0 ? 1 : 3)) {
vm_map_unlock(map);
- vm_contig_grow_cache(tries, low, high);
+ vm_pageout_grow_cache(tries, low, high);
vm_map_lock(map);
VM_OBJECT_LOCK(object);
tries++;
Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cWed Jul 18 04:52:37 2012(r238560)
+++ head/sys/vm/vm_pageout.cWed Jul 18 05:21:34 2012(r238561)
@@ -209,11 +209,14 @@ int vm_page_max_wired;/* XXX max # of
SYSCTL_INT(_vm, OID_AUTO, max_wired,
CTLFLAG_RW, &vm_page_max_wired, 0, "System-wide limit to wired page
count");
+static boolean_t vm_pageout_fallback_object_lock(vm_page_t, vm_page_t *);
+static boolean_t vm_pageout_launder(int, int, vm_paddr_t, vm_paddr_t);
#if !defined(NO_SWAPPING)
static void vm_pageout_map_deactivate_pages(vm_map_t, long);
static void vm_pageout_object_deactivate_pages(pmap_t, vm_object_t, long);
static void vm_req_vmdaemon(int req);
#endif
+static boolean_t vm_pageout_page_lock(vm_page_t, vm_page_t *);
static void vm_pageout_page_stats(void);
/*
@@ -247,7 +250,7 @@ vm_pageout_init_marker(vm_page_t marker,
* This function depends on both the lock portion of struct vm_object
* and normal struct vm_page being type stable.
*/
-boolean_t
+static boolean_t
vm_pageout_fallback_object_lock(vm_page_t m, vm_page_t *next)
{
struct vm_page marker;
@@ -286,7 +289,7 @@ vm_pageout_fallback_object_lock(vm_page_
*
* This function depends on normal struct vm_page being type stable.
*/
-boolean_t
+static boolean_t
vm_pageout_page_lock(vm_page_t m, vm_page_t *next)
{
struct vm_page marker;
@@ -558,6 +561,138 @@ vm_pageout_flush(vm_page_t *mc, int coun
return (numpagedout);
}
+static boolean_t
+vm_pageout_launder(int queue, int tries, vm_paddr_t low, vm_paddr_t high)
+{
+ struct mount *mp;
+ struct vnode *vp;
+ vm_object_t object;
+ vm_paddr_t pa;
+ vm_page_t m, m_tmp, next;
+ int vfslocked;
+
+ vm_page_lock_queues();
+ TAILQ_FOREACH_SAFE(m, &vm_page_queues[queue].pl, pageq, next) {
+ KASSERT(m->queue == queue,
+ ("vm_pageout_launder: page %p's queue is not %d", m,
+ queue));
+ if (
svn commit: r238562 - head
Author: avatar
Date: Wed Jul 18 05:50:40 2012
New Revision: 238562
URL: http://svn.freebsd.org/changeset/base/238562
Log:
Removing bsd{ar,ranlib} found on my ancient installation.
MFC after:3 weeks
Modified:
head/ObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Wed Jul 18 05:21:34 2012(r238561)
+++ head/ObsoleteFiles.inc Wed Jul 18 05:50:40 2012(r238562)
@@ -1358,6 +1358,11 @@ OLD_FILES+=usr/share/man/man2/kse_thr_in
OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
OLD_FILES+=usr/lib32/libkse.so
OLD_LIBS+=usr/lib32/libkse.so.3
+# 20080225: bsdar/bsdranlib rename to ar/ranlib
+OLD_FILES+=usr/bin/bsdar
+OLD_FILES+=usr/bin/bsdranlib
+OLD_FILES+=usr/share/man/man1/bsdar.1.gz
+OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
___
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: r238563 - head/gnu/usr.bin/groff/tmac
Author: obrien
Date: Wed Jul 18 05:57:42 2012
New Revision: 238563
URL: http://svn.freebsd.org/changeset/base/238563
Log:
a ";" tells make we want the shell to be used
Submitted by: Simon Gerraty
Modified:
head/gnu/usr.bin/groff/tmac/Makefile
Modified: head/gnu/usr.bin/groff/tmac/Makefile
==
--- head/gnu/usr.bin/groff/tmac/MakefileWed Jul 18 05:50:40 2012
(r238562)
+++ head/gnu/usr.bin/groff/tmac/MakefileWed Jul 18 05:57:42 2012
(r238563)
@@ -68,7 +68,7 @@ beforeinstall:
cd ${.CURDIR}; \
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
- cd ${.OBJDIR}
+ cd ${.OBJDIR};
.for f in ${STRIPFILES} ${SPECIALFILES}
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${TMACDIR}/$f
___
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"
