PERFORCE change 106134 for review
Warner Losh
imp at FreeBSD.org
Thu Sep 14 22:58:18 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=106134
Change 106134 by imp at imp_paco-paco on 2006/09/15 05:57:16
IFC @106133
Affected files ...
.. //depot/projects/arm/src/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile.arm#4 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#5 integrate
.. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/config.h#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#3 integrate
.. //depot/projects/arm/src/sbin/mount/mount.8#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#9 integrate
.. //depot/projects/arm/src/sys/kern/vfs_lookup.c#11 integrate
.. //depot/projects/arm/src/usr.sbin/inetd/inetd.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/inetd/inetd.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/inetd/inetd.h#2 integrate
Differences ...
==== //depot/projects/arm/src/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/Makefile.arm#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.2 2006/09/12 06:59:39 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.3 2006/09/14 07:44:05 imp Exp $
.if defined(TARGET_BIG_ENDIAN)
NATIVE_EMULATION= armelfb_fbsd
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/binutils/ld/genscripts.sh#3 (text+ko) ====
@@ -9,7 +9,7 @@
# sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
# produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
#
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.6 2004/06/16 07:09:37 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $
#
# This is a cut-down version of the GNU script. Instead of jumping through
# hoops for all possible combinations of paths, just use the libdir
==== //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.5 2006/09/12 07:03:58 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.8 2006/09/14 08:21:20 imp Exp $
.if defined(TARGET_BIG_ENDIAN)
DEFAULT_VECTOR= bfd_elf32_bigarm_vec
@@ -7,8 +7,8 @@
.endif
SRCS+= cpu-arm.c \
+ elf32.c \
elf32-arm-fbsd.c \
- elf32.c \
elf32-gen.c \
elf32-target.h \
elflink.c
@@ -29,7 +29,7 @@
-e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \
-e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" \
-e s/"#include.*elf32-arm.h.*//" >${.TARGET}
- echo '\
+ echo ' \
static bfd_boolean \
elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \
{ size_t raw_size =68 ; int offset = 28; \
==== //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.9 2006/09/12 07:37:02 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.10 2006/09/15 05:21:06 imp Exp $
TARGET_ARCH?= ${MACHINE_ARCH}
@@ -6,7 +6,7 @@
GCC_CPU= alpha
.elif ${TARGET_ARCH} == "arm"
GCC_CPU= arm
-####TARGET_CPU_DEFAULT= TARGET_CPU_xscale
+# TARGET_CPU_DEFAULT= TARGET_CPU_xscale
.if defined(TARGET_BIG_ENDIAN)
CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
.endif
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/Makefile#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/config.h#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/init.c#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#2 (text+ko) ====
==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.1 2006/07/22 15:27:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.2 2006/09/14 07:51:52 imp Exp $");
#include <sys/types.h>
#ifndef CROSS_DEBUGGER
==== //depot/projects/arm/src/sbin/mount/mount.8#3 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.79 2006/09/08 13:47:39 danger Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.80 2006/09/14 13:47:55 des Exp $
.\"
.Dd July 12, 2006
.Dt MOUNT 8
@@ -157,7 +157,8 @@
file for the file system.
.It Cm late
This file system should be skipped when
-.Nm is run with the
+.Nm
+is run with the
.Fl a
flag but without the
.Fl l
==== //depot/projects/arm/src/sys/dev/ata/ata-disk.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.198 2006/08/09 18:23:47 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.199 2006/09/14 19:12:29 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -105,7 +105,8 @@
}
device_set_ivars(dev, adp);
- if (atadev->param.atavalid & ATA_FLAG_54_58) {
+ if ((atadev->param.atavalid & ATA_FLAG_54_58) &&
+ atadev->param.current_heads && atadev->param.current_sectors) {
adp->heads = atadev->param.current_heads;
adp->sectors = atadev->param.current_sectors;
adp->total_secs = (u_int32_t)atadev->param.current_size_1 |
==== //depot/projects/arm/src/sys/kern/vfs_lookup.c#11 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.94 2006/09/13 18:39:08 mohans Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.95 2006/09/14 17:57:02 mohans Exp $");
#include "opt_ktrace.h"
#include "opt_mac.h"
@@ -306,7 +306,8 @@
static int
compute_cn_lkflags(struct mount *mp, int lkflags)
{
- if ((lkflags & LK_SHARED) && !(mp->mnt_kern_flag & MNTK_LOOKUP_SHARED)) {
+ if (mp == NULL ||
+ ((lkflags & LK_SHARED) && !(mp->mnt_kern_flag & MNTK_LOOKUP_SHARED))) {
lkflags &= ~LK_SHARED;
lkflags |= LK_EXCLUSIVE;
}
==== //depot/projects/arm/src/usr.sbin/inetd/inetd.8#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)inetd.8 8.3 (Berkeley) 4/13/94
-.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.83 2006/02/04 22:17:38 ceri Exp $
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.84 2006/09/14 08:36:53 ru Exp $
.\"
-.Dd February 4, 2006
+.Dd September 14, 2006
.Dt INETD 8
.Os
.Sh NAME
@@ -286,21 +286,6 @@
via a wildcard
.Dv AF_INET6
socket.
-If it is desired that the service is reachable via T/TCP, one should
-specify
-.Dq tcp/ttcp ,
-which implies IPv4 for backward compatibility.
-The name
-.Dq tcp4/ttcp
-specifies IPv4 only, while
-.Dq tcp6/ttcp
-specifies IPv6 only.
-The name
-.Dq tcp46/ttcp
-specifies that the entry accepts both IPv6 and IPv6 connections
-via a wildcard
-.Dv AF_INET6
-socket.
Rpc based services
are specified with the
.Dq rpc/tcp
==== //depot/projects/arm/src/usr.sbin/inetd/inetd.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.133 2006/01/18 19:38:42 delphij Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.134 2006/09/14 08:36:53 ru Exp $");
/*
* Inetd - Internet super-server
@@ -69,7 +69,7 @@
* or name a tcpmux service
* or specify a unix domain socket
* socket type stream/dgram/raw/rdm/seqpacket
- * protocol tcp[4][6][/faith,ttcp], udp[4][6], unix
+ * protocol tcp[4][6][/faith], udp[4][6], unix
* wait/nowait single-threaded/multi-threaded
* user user to run daemon as
* server program full path name
@@ -1301,10 +1301,6 @@
syslog(LOG_ERR, "setsockopt (IPV6_V6ONLY): %m");
}
#undef turnon
- if (sep->se_type == TTCP_TYPE)
- if (setsockopt(sep->se_fd, IPPROTO_TCP, TCP_NOPUSH,
- (char *)&on, sizeof (on)) < 0)
- syslog(LOG_ERR, "setsockopt (TCP_NOPUSH): %m");
#ifdef IPV6_FAITH
if (sep->se_type == FAITH_TYPE) {
if (setsockopt(sep->se_fd, IPPROTO_IPV6, IPV6_FAITH, &on,
@@ -1746,9 +1742,7 @@
if (strncmp(arg, "tcp", 3) == 0) {
sep->se_proto = newstr(strsep(&arg, "/"));
if (arg != NULL) {
- if (strcmp(arg, "ttcp") == 0)
- sep->se_type = TTCP_TYPE;
- else if (strcmp(arg, "faith") == 0)
+ if (strcmp(arg, "faith") == 0)
sep->se_type = FAITH_TYPE;
}
} else {
==== //depot/projects/arm/src/usr.sbin/inetd/inetd.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.16 2006/01/18 19:38:43 delphij Exp $
+ * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.17 2006/09/14 08:36:53 ru Exp $
*/
#include <sys/time.h>
@@ -44,12 +44,10 @@
#define NORM_TYPE 0
#define MUX_TYPE 1
#define MUXPLUS_TYPE 2
-#define TTCP_TYPE 3
#define FAITH_TYPE 4
#define ISMUX(sep) (((sep)->se_type == MUX_TYPE) || \
((sep)->se_type == MUXPLUS_TYPE))
#define ISMUXPLUS(sep) ((sep)->se_type == MUXPLUS_TYPE)
-#define ISTTCP(sep) ((sep)->se_type == TTCP_TYPE)
struct procinfo {
LIST_ENTRY(procinfo) pr_link;
More information about the p4-projects
mailing list