[Glibc-bsd-commits] r2074 - in trunk/kfreebsd-7/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Sun Dec 9 12:44:05 UTC 2007
Author: aurel32
Date: 2007-12-09 12:44:05 +0000 (Sun, 09 Dec 2007)
New Revision: 2074
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/patches/001_misc.diff
trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-7/debian/patches/004_xargs.diff
trunk/kfreebsd-7/debian/patches/005_binutils.diff
trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
trunk/kfreebsd-7/debian/patches/008_config.diff
trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
trunk/kfreebsd-7/debian/patches/020_linker.diff
trunk/kfreebsd-7/debian/patches/902_version.diff
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/904_dev_full.diff
trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-7/debian/patches/911_no_werror.diff
trunk/kfreebsd-7/debian/patches/912_binutils.diff
trunk/kfreebsd-7/debian/patches/913_uudecode.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
Log:
* Refresh all patches.
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/changelog 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,3 +1,10 @@
+kfreebsd-7 (7.0~cvs20071209-2) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Refresh all patches.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 09 Dec 2007 13:43:21 +0100
+
kfreebsd-7 (7.0~cvs20071209-1) experimental; urgency=low
[ Petr Salinger ]
Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -4,8 +4,8 @@
Index: sys/conf/kern.mk
===================================================================
---- sys/conf/kern.mk.orig 2007-05-30 12:30:16.000000000 +0200
-+++ sys/conf/kern.mk 2007-05-30 12:45:13.000000000 +0200
+--- sys/conf/kern.mk.orig 2007-12-09 13:18:02.329538000 +0100
++++ sys/conf/kern.mk 2007-12-09 13:24:46.000000000 +0100
@@ -1,5 +1,9 @@
# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
@@ -49,8 +49,8 @@
Index: sys/conf/kern.post.mk
===================================================================
---- sys/conf/kern.post.mk.orig 2007-05-30 12:30:16.000000000 +0200
-+++ sys/conf/kern.post.mk 2007-05-30 12:44:43.000000000 +0200
+--- sys/conf/kern.post.mk.orig 2007-12-09 13:18:02.373992000 +0100
++++ sys/conf/kern.post.mk 2007-12-09 13:25:40.851878000 +0100
@@ -1,5 +1,15 @@
# $FreeBSD: src/sys/conf/kern.post.mk,v 1.100 2007/03/23 21:55:59 imp Exp $
Modified: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,7 +1,7 @@
Index: sys/dev/aic7xxx/aicasm/Makefile
===================================================================
---- sys/dev/aic7xxx/aicasm/Makefile.orig 2005-12-27 22:35:40.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/Makefile.orig 2007-12-09 13:18:01.866480000 +0100
++++ sys/dev/aic7xxx/aicasm/Makefile 2007-12-09 13:24:46.000000000 +0100
@@ -14,7 +14,7 @@
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
@@ -27,8 +27,8 @@
.endif
Index: sys/dev/aic7xxx/aicasm/aicasm.h
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm.h.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm.h 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm.h.orig 2007-12-09 13:18:01.898319000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm.h 2007-12-09 13:24:46.000000000 +0100
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
@@ -43,8 +43,8 @@
#endif
Index: sys/dev/aic7xxx/aicasm/aicasm_gram.y
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_gram.y 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_gram.y.orig 2007-12-09 13:18:01.930222000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_gram.y 2007-12-09 13:24:46.000000000 +0100
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -59,8 +59,8 @@
#endif
Index: sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y.orig 2007-12-09 13:18:01.962338000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y 2007-12-09 13:24:46.000000000 +0100
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -75,8 +75,8 @@
#endif
Index: sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l.orig 2007-12-09 13:18:02.001422000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l 2007-12-09 13:24:46.000000000 +0100
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -92,8 +92,8 @@
#endif
Index: sys/dev/aic7xxx/aicasm/aicasm_scan.l
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_scan.l 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_scan.l.orig 2007-12-09 13:18:02.033612000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_scan.l 2007-12-09 13:24:46.000000000 +0100
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -109,8 +109,8 @@
#endif
Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.c
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.c.orig 2007-12-09 13:18:02.065829000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.c 2007-12-09 13:24:46.000000000 +0100
@@ -44,10 +44,11 @@
#include <sys/types.h>
@@ -128,8 +128,8 @@
#include <inttypes.h>
Index: sys/dev/aic7xxx/aicasm/aicasm_symbol.h
===================================================================
---- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig 2005-01-06 02:42:27.000000000 +0100
-+++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h 2006-06-24 17:31:56.000000000 +0200
+--- sys/dev/aic7xxx/aicasm/aicasm_symbol.h.orig 2007-12-09 13:18:02.120282000 +0100
++++ sys/dev/aic7xxx/aicasm/aicasm_symbol.h 2007-12-09 13:24:46.000000000 +0100
@@ -42,8 +42,9 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
*/
Modified: trunk/kfreebsd-7/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/004_xargs.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -3,8 +3,8 @@
Index: sys/conf/kmod.mk
===================================================================
---- sys/conf/kmod.mk.orig 2007-05-30 12:30:16.000000000 +0200
-+++ sys/conf/kmod.mk 2007-05-30 12:47:06.000000000 +0200
+--- sys/conf/kmod.mk.orig 2007-12-09 13:18:01.690204000 +0100
++++ sys/conf/kmod.mk 2007-12-09 13:25:40.902194000 +0100
@@ -204,7 +204,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
@@ -16,8 +16,8 @@
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
Index: sys/contrib/dev/acpica/acpica_prep.sh
===================================================================
---- sys/contrib/dev/acpica/acpica_prep.sh.orig 2007-05-30 12:30:17.000000000 +0200
-+++ sys/contrib/dev/acpica/acpica_prep.sh 2007-05-30 12:48:27.000000000 +0200
+--- sys/contrib/dev/acpica/acpica_prep.sh.orig 2007-12-09 13:18:01.744163000 +0100
++++ sys/contrib/dev/acpica/acpica_prep.sh 2007-12-09 13:24:46.000000000 +0100
@@ -55,12 +55,12 @@
echo copying full dirs
Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -3,8 +3,8 @@
Index: sys/i386/i386/locore.s
===================================================================
---- sys/i386/i386/locore.s.orig 2005-05-16 11:47:53.000000000 +0200
-+++ sys/i386/i386/locore.s 2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/i386/locore.s.orig 2007-12-09 13:18:01.102886000 +0100
++++ sys/i386/i386/locore.s 2007-12-09 13:24:46.000000000 +0100
@@ -358,7 +358,7 @@
pushl %eax
testl $PSL_VM,UC_EFLAGS(%eax)
@@ -34,9 +34,9 @@
pushl %eax /* junk to fake return addr. */
Index: sys/i386/i386/swtch.s
===================================================================
---- sys/i386/i386/swtch.s.orig 2005-04-14 00:57:17.000000000 +0200
-+++ sys/i386/i386/swtch.s 2006-06-24 17:32:27.000000000 +0200
-@@ -111,7 +111,7 @@
+--- sys/i386/i386/swtch.s.orig 2007-12-09 13:18:01.139146000 +0100
++++ sys/i386/i386/swtch.s 2007-12-09 13:24:46.000000000 +0100
+@@ -130,7 +130,7 @@
movl %ebp,PCB_EBP(%edx)
movl %esi,PCB_ESI(%edx)
movl %edi,PCB_EDI(%edx)
@@ -44,8 +44,8 @@
+ movw %gs,PCB_GS(%edx)
pushfl /* PSL */
popl PCB_PSL(%edx)
- /* Check to see if we need to call a switchout function. */
-@@ -279,7 +279,7 @@
+ /* Test if debug registers should be saved. */
+@@ -301,7 +301,7 @@
/* This must be done after loading the user LDT. */
.globl cpu_switch_load_gs
cpu_switch_load_gs:
@@ -54,7 +54,7 @@
/* Test if debug registers should be restored. */
testl $PCB_DBREGS,PCB_FLAGS(%edx)
-@@ -348,7 +348,7 @@
+@@ -371,7 +371,7 @@
movl %ebp,PCB_EBP(%ecx)
movl %esi,PCB_ESI(%ecx)
movl %edi,PCB_EDI(%ecx)
@@ -65,8 +65,8 @@
Index: sys/i386/include/cpufunc.h
===================================================================
---- sys/i386/include/cpufunc.h.orig 2005-05-13 02:05:56.000000000 +0200
-+++ sys/i386/include/cpufunc.h 2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/include/cpufunc.h.orig 2007-12-09 13:18:01.175563000 +0100
++++ sys/i386/include/cpufunc.h 2007-12-09 13:24:46.000000000 +0100
@@ -452,7 +452,7 @@
rfs(void)
{
@@ -76,7 +76,7 @@
return (sel);
}
-@@ -460,7 +460,7 @@
+@@ -468,7 +468,7 @@
rgs(void)
{
u_int sel;
@@ -85,7 +85,7 @@
return (sel);
}
-@@ -468,12 +468,12 @@
+@@ -507,13 +507,13 @@
static __inline void
load_fs(u_int sel)
{
@@ -103,8 +103,8 @@
static __inline void
Index: sys/i386/linux/linux_locore.s
===================================================================
---- sys/i386/linux/linux_locore.s.orig 2001-02-25 07:29:01.000000000 +0100
-+++ sys/i386/linux/linux_locore.s 2006-06-24 17:32:27.000000000 +0200
+--- sys/i386/linux/linux_locore.s.orig 2007-12-09 13:18:01.216859000 +0100
++++ sys/i386/linux/linux_locore.s 2007-12-09 13:24:46.000000000 +0100
@@ -8,7 +8,7 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -125,9 +125,9 @@
int $0x80 /* enter kernel with args */
Index: sys/compat/ndis/winx32_wrap.S
===================================================================
---- sys/compat/ndis/winx32_wrap.S.orig 2005-11-06 04:52:25.000000000 +0100
-+++ sys/compat/ndis/winx32_wrap.S 2006-06-24 17:32:27.000000000 +0200
-@@ -364,7 +364,7 @@
+--- sys/compat/ndis/winx32_wrap.S.orig 2007-12-09 13:18:01.257978000 +0100
++++ sys/compat/ndis/winx32_wrap.S 2007-12-09 13:24:46.000000000 +0100
+@@ -369,7 +369,7 @@
ret
ENTRY(x86_setfs)
@@ -138,9 +138,9 @@
ENTRY(x86_gettid)
Index: sys/amd64/amd64/cpu_switch.S
===================================================================
---- sys/amd64/amd64/cpu_switch.S.orig 2005-11-15 01:25:59.000000000 +0100
-+++ sys/amd64/amd64/cpu_switch.S 2006-06-24 17:33:03.000000000 +0200
-@@ -102,7 +102,7 @@
+--- sys/amd64/amd64/cpu_switch.S.orig 2007-12-09 13:18:01.294602000 +0100
++++ sys/amd64/amd64/cpu_switch.S 2007-12-09 13:24:46.000000000 +0100
+@@ -110,7 +110,7 @@
jz 1f /* no, skip over */
/* Save userland %gs */
@@ -149,7 +149,7 @@
movq PCB_GS32P(%r8),%rax
movq (%rax),%rax
movq %rax,PCB_GS32SD(%r8)
-@@ -204,7 +204,7 @@
+@@ -220,7 +220,7 @@
movq %rbx,(%rax)
movl $MSR_GSBASE,%ecx
rdmsr
@@ -160,9 +160,9 @@
1:
Index: sys/amd64/ia32/ia32_signal.c
===================================================================
---- sys/amd64/ia32/ia32_signal.c.orig 2004-04-06 01:55:14.000000000 +0200
-+++ sys/amd64/ia32/ia32_signal.c 2006-06-24 17:32:27.000000000 +0200
-@@ -197,8 +197,8 @@
+--- sys/amd64/ia32/ia32_signal.c.orig 2007-12-09 13:18:01.326931000 +0100
++++ sys/amd64/ia32/ia32_signal.c 2007-12-09 13:24:46.000000000 +0100
+@@ -328,8 +328,8 @@
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -173,7 +173,7 @@
sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-@@ -309,8 +309,8 @@
+@@ -443,8 +443,8 @@
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -186,8 +186,8 @@
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
Index: sys/amd64/include/cpufunc.h
===================================================================
---- sys/amd64/include/cpufunc.h.orig 2005-05-13 02:05:55.000000000 +0200
-+++ sys/amd64/include/cpufunc.h 2006-06-24 17:32:27.000000000 +0200
+--- sys/amd64/include/cpufunc.h.orig 2007-12-09 13:18:01.400151000 +0100
++++ sys/amd64/include/cpufunc.h 2007-12-09 13:24:46.000000000 +0100
@@ -482,7 +482,7 @@
rfs(void)
{
@@ -266,9 +266,9 @@
Index: sys/amd64/linux32/linux32_sysvec.c
===================================================================
---- sys/amd64/linux32/linux32_sysvec.c.orig 2005-12-22 22:25:19.000000000 +0100
-+++ sys/amd64/linux32/linux32_sysvec.c 2006-06-24 17:32:27.000000000 +0200
-@@ -345,9 +345,9 @@
+--- sys/amd64/linux32/linux32_sysvec.c.orig 2007-12-09 13:18:01.432524000 +0100
++++ sys/amd64/linux32/linux32_sysvec.c 2007-12-09 13:24:46.000000000 +0100
+@@ -355,9 +355,9 @@
frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
frame.sf_sc.uc_mcontext.sc_gs = rgs();
frame.sf_sc.uc_mcontext.sc_fs = rfs();
@@ -280,7 +280,7 @@
"=rm" (frame.sf_sc.uc_mcontext.sc_ds));
frame.sf_sc.uc_mcontext.sc_edi = regs->tf_rdi;
frame.sf_sc.uc_mcontext.sc_esi = regs->tf_rsi;
-@@ -474,8 +474,8 @@
+@@ -489,8 +489,8 @@
frame.sf_sc.sc_mask = lmask.__bits[0];
frame.sf_sc.sc_gs = rgs();
frame.sf_sc.sc_fs = rfs();
@@ -293,8 +293,8 @@
frame.sf_sc.sc_ebp = regs->tf_rbp;
Index: sys/amd64/ia32/ia32_sigtramp.S
===================================================================
---- sys/amd64/ia32/ia32_sigtramp.S.orig 2003-08-23 01:19:02.000000000 +0200
-+++ sys/amd64/ia32/ia32_sigtramp.S 2006-06-24 17:32:27.000000000 +0200
+--- sys/amd64/ia32/ia32_sigtramp.S.orig 2007-12-09 13:18:01.363520000 +0100
++++ sys/amd64/ia32/ia32_sigtramp.S 2007-12-09 13:24:46.000000000 +0100
@@ -45,8 +45,8 @@
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
@@ -319,8 +319,8 @@
int $0x80 /* enter kernel with args */
Index: sys/amd64/linux32/linux32_locore.s
===================================================================
---- sys/amd64/linux32/linux32_locore.s.orig 2004-08-16 09:55:06.000000000 +0200
-+++ sys/amd64/linux32/linux32_locore.s 2006-06-24 17:32:27.000000000 +0200
+--- sys/amd64/linux32/linux32_locore.s.orig 2007-12-09 13:18:01.482547000 +0100
++++ sys/amd64/linux32/linux32_locore.s 2007-12-09 13:24:46.000000000 +0100
@@ -11,8 +11,8 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,8 +1,8 @@
Index: sys/kern/kern_fork.c
===================================================================
---- sys/kern/kern_fork.c.orig 2006-03-19 00:37:36.000000000 +0100
-+++ sys/kern/kern_fork.c 2006-06-24 17:33:20.000000000 +0200
-@@ -517,7 +517,11 @@
+--- sys/kern/kern_fork.c.orig 2007-12-09 13:18:00.934173000 +0100
++++ sys/kern/kern_fork.c 2007-12-09 13:24:47.000000000 +0100
+@@ -485,7 +485,11 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
@@ -17,9 +17,9 @@
Index: sys/sys/unistd.h
===================================================================
---- sys/sys/unistd.h.orig 2005-01-07 03:29:24.000000000 +0100
-+++ sys/sys/unistd.h 2006-06-24 17:33:20.000000000 +0200
-@@ -173,6 +173,10 @@
+--- sys/sys/unistd.h.orig 2007-12-09 13:18:00.979104000 +0100
++++ sys/sys/unistd.h 2007-12-09 13:24:47.000000000 +0100
+@@ -181,6 +181,10 @@
#define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */
#define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */
#define RFKERNELONLY (RFSTOPPED | RFHIGHPID | RFPPWAIT)
Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -5,8 +5,8 @@
Index: usr.sbin/config/Makefile
===================================================================
---- usr.sbin/config/Makefile.orig 2007-05-30 17:48:56.000000000 +0200
-+++ usr.sbin/config/Makefile 2007-05-30 17:52:41.000000000 +0200
+--- usr.sbin/config/Makefile.orig 2007-12-09 13:18:00.765343000 +0100
++++ usr.sbin/config/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,11 +9,11 @@
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
@@ -24,8 +24,8 @@
Index: usr.sbin/config/main.c
===================================================================
---- usr.sbin/config/main.c.orig 2007-05-30 17:48:56.000000000 +0200
-+++ usr.sbin/config/main.c 2007-05-30 17:53:51.000000000 +0200
+--- usr.sbin/config/main.c.orig 2007-12-09 13:18:00.810055000 +0100
++++ usr.sbin/config/main.c 2007-12-09 13:24:47.000000000 +0100
@@ -41,12 +41,18 @@
"$FreeBSD: src/usr.sbin/config/main.c,v 1.76 2007/05/17 04:53:52 imp Exp $";
#endif /* not lint */
Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -3,8 +3,8 @@
Index: sys/conf/Makefile.amd64
===================================================================
---- sys/conf/Makefile.amd64.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.amd64 2006-06-24 17:33:28.000000000 +0200
+--- sys/conf/Makefile.amd64.orig 2007-12-09 13:18:00.390486000 +0100
++++ sys/conf/Makefile.amd64 2007-12-09 13:24:47.000000000 +0100
@@ -38,6 +38,8 @@
MKMODULESENV+= MACHINE=amd64
@@ -16,11 +16,11 @@
%OBJS
Index: sys/conf/Makefile.arm
===================================================================
---- sys/conf/Makefile.arm.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.arm 2006-06-24 17:33:28.000000000 +0200
-@@ -101,6 +101,8 @@
+--- sys/conf/Makefile.arm.orig 2007-12-09 13:18:00.422256000 +0100
++++ sys/conf/Makefile.arm 2007-12-09 13:24:47.000000000 +0100
+@@ -109,6 +109,8 @@
rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
- inflate-tramp.o
+ inflate-tramp.o tmphack.S
+%WITHOUT_MODULES
+
@@ -29,11 +29,11 @@
%OBJS
Index: sys/conf/Makefile.i386
===================================================================
---- sys/conf/Makefile.i386.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.i386 2006-06-24 17:33:28.000000000 +0200
-@@ -32,6 +32,8 @@
+--- sys/conf/Makefile.i386.orig 2007-12-09 13:18:00.454097000 +0100
++++ sys/conf/Makefile.i386 2007-12-09 13:24:47.000000000 +0100
+@@ -34,6 +34,8 @@
- MKMODULESENV+= MACHINE=i386
+ MKMODULESENV+= MACHINE=${MACHINE}
+%WITHOUT_MODULES
+
@@ -42,9 +42,9 @@
%OBJS
Index: sys/conf/Makefile.ia64
===================================================================
---- sys/conf/Makefile.ia64.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.ia64 2006-06-24 17:33:28.000000000 +0200
-@@ -38,6 +38,8 @@
+--- sys/conf/Makefile.ia64.orig 2007-12-09 13:18:00.486110000 +0100
++++ sys/conf/Makefile.ia64 2007-12-09 13:24:47.000000000 +0100
+@@ -36,6 +36,8 @@
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -55,11 +55,11 @@
%OBJS
Index: sys/conf/Makefile.pc98
===================================================================
---- sys/conf/Makefile.pc98.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.pc98 2006-06-24 17:33:28.000000000 +0200
-@@ -32,6 +32,8 @@
+--- sys/conf/Makefile.pc98.orig 2007-12-09 13:18:00.517944000 +0100
++++ sys/conf/Makefile.pc98 2007-12-09 13:24:47.000000000 +0100
+@@ -34,6 +34,8 @@
- MKMODULESENV+= MACHINE=pc98
+ MKMODULESENV+= MACHINE=${MACHINE}
+%WITHOUT_MODULES
+
@@ -68,8 +68,8 @@
%OBJS
Index: sys/conf/Makefile.powerpc
===================================================================
---- sys/conf/Makefile.powerpc.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.powerpc 2006-06-24 17:33:28.000000000 +0200
+--- sys/conf/Makefile.powerpc.orig 2007-12-09 13:18:00.549928000 +0100
++++ sys/conf/Makefile.powerpc 2007-12-09 13:24:47.000000000 +0100
@@ -37,6 +37,8 @@
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -81,8 +81,8 @@
%OBJS
Index: sys/conf/Makefile.sparc64
===================================================================
---- sys/conf/Makefile.sparc64.orig 2005-10-28 21:04:03.000000000 +0200
-+++ sys/conf/Makefile.sparc64 2006-06-24 17:33:28.000000000 +0200
+--- sys/conf/Makefile.sparc64.orig 2007-12-09 13:18:00.590733000 +0100
++++ sys/conf/Makefile.sparc64 2007-12-09 13:24:47.000000000 +0100
@@ -32,6 +32,8 @@
MDOBJS= exception.o interrupt.o
@@ -94,8 +94,8 @@
%OBJS
Index: usr.sbin/config/mkmakefile.c
===================================================================
---- usr.sbin/config/mkmakefile.c.orig 2004-08-31 01:03:56.000000000 +0200
-+++ usr.sbin/config/mkmakefile.c 2006-06-24 17:33:28.000000000 +0200
+--- usr.sbin/config/mkmakefile.c.orig 2007-12-09 13:18:00.636540000 +0100
++++ usr.sbin/config/mkmakefile.c 2007-12-09 13:24:47.000000000 +0100
@@ -70,6 +70,7 @@
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
@@ -104,7 +104,7 @@
static void do_before_depend(FILE *);
static int opteq(const char *, const char *);
static void read_files(void);
-@@ -150,6 +151,8 @@
+@@ -142,6 +143,8 @@
}
if (eq(line, "%BEFORE_DEPEND\n"))
do_before_depend(ofp);
@@ -113,7 +113,7 @@
else if (eq(line, "%OBJS\n"))
do_objs(ofp);
else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -618,6 +621,28 @@
+@@ -622,6 +625,28 @@
}
static void
Modified: trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/010_ET_DYN.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -2,10 +2,10 @@
Index: sys/kern/imgact_elf.c
===================================================================
---- sys/kern/imgact_elf.c.orig 2007-05-30 12:31:15.000000000 +0200
-+++ sys/kern/imgact_elf.c 2007-05-30 13:05:38.000000000 +0200
-@@ -610,6 +610,8 @@
- char *path;
+--- sys/kern/imgact_elf.c.orig 2007-12-09 13:18:00.268757000 +0100
++++ sys/kern/imgact_elf.c 2007-12-09 13:24:47.000000000 +0100
+@@ -619,6 +619,8 @@
+ const char *note_name;
struct thread *td = curthread;
struct sysentvec *sv;
+ u_long rbase = 0;
@@ -13,7 +13,7 @@
/*
* Do we have a valid ELF header ?
-@@ -649,11 +651,27 @@
+@@ -660,11 +662,27 @@
hdr->e_ident[EI_OSABI]);
return (ENOEXEC);
}
@@ -42,7 +42,7 @@
interp = brand_info->interp_newpath;
/*
-@@ -695,7 +713,7 @@
+@@ -706,7 +724,7 @@
if ((error = __elfN(load_section)(vmspace,
imgp->object, phdr[i].p_offset,
@@ -51,7 +51,7 @@
phdr[i].p_memsz, phdr[i].p_filesz, prot,
sv->sv_pagesize)) != 0)
return (error);
-@@ -709,11 +727,12 @@
+@@ -720,11 +738,12 @@
if (phdr[i].p_offset == 0 &&
hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
<= phdr[i].p_filesz)
@@ -65,7 +65,7 @@
/*
* Is this .text or .data? We can't use
-@@ -735,7 +754,7 @@
+@@ -746,7 +765,7 @@
phdr[i].p_memsz)) {
text_size = seg_size;
text_addr = seg_addr;
@@ -74,12 +74,12 @@
} else {
data_size = seg_size;
data_addr = seg_addr;
-@@ -743,7 +762,7 @@
+@@ -754,7 +773,7 @@
total_size += seg_size;
break;
case PT_PHDR: /* Program header table info */
- proghdr = phdr[i].p_vaddr;
+ proghdr = phdr[i].p_vaddr + rbase;
break;
- default:
- break;
+ case PT_NOTE:
+ pnote = &phdr[i];
Modified: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,7 +1,7 @@
Index: sys/netinet/ip.h
===================================================================
---- sys/netinet/ip.h.orig 2007-05-30 12:31:30.000000000 +0200
-+++ sys/netinet/ip.h 2007-05-30 13:08:18.000000000 +0200
+--- sys/netinet/ip.h.orig 2007-12-09 13:18:00.128808000 +0100
++++ sys/netinet/ip.h 2007-12-09 13:24:47.000000000 +0100
@@ -67,7 +67,7 @@
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
Modified: trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,8 +1,8 @@
Index: sys/sys/soundcard.h
===================================================================
---- sys/sys/soundcard.h.orig 2005-12-30 20:55:52.000000000 +0100
-+++ sys/sys/soundcard.h 2006-06-24 17:38:44.000000000 +0200
-@@ -809,6 +813,8 @@
+--- sys/sys/soundcard.h.orig 2007-12-09 13:17:59.996600000 +0100
++++ sys/sys/soundcard.h 2007-12-09 13:24:47.000000000 +0100
+@@ -813,6 +813,8 @@
/* Has a coprocessor, sometimes it's a DSP but usually not */
#define DSP_CAP_TRIGGER 0x00001000 /* Supports SETTRIGGER */
#define DSP_CAP_MMAP 0x00002000 /* Supports mmap() */
Modified: trunk/kfreebsd-7/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -4,10 +4,11 @@
for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-diff -u sys/conf/kern.post.mk sys/conf/kern.post.mk
---- sys/conf/kern.post.mk
-+++ sys/conf/kern.post.mk
-@@ -82,7 +92,9 @@
+Index: sys/conf/kern.post.mk
+===================================================================
+--- sys/conf/kern.post.mk.orig 2007-12-09 13:25:30.578016000 +0100
++++ sys/conf/kern.post.mk 2007-12-09 13:25:36.000000000 +0100
+@@ -95,7 +95,9 @@
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -18,10 +19,11 @@
.if !defined(DEBUG)
${OBJCOPY} --strip-debug ${.TARGET}
.endif
-diff -u sys/conf/kmod.mk sys/conf/kmod.mk
---- sys/conf/kmod.mk
-+++ sys/conf/kmod.mk
-@@ -179,7 +179,8 @@
+Index: sys/conf/kmod.mk
+===================================================================
+--- sys/conf/kmod.mk.orig 2007-12-09 13:25:30.639703000 +0100
++++ sys/conf/kmod.mk 2007-12-09 13:25:36.000000000 +0100
+@@ -177,7 +177,8 @@
.if ${MACHINE_ARCH} != amd64
${FULLPROG}: ${KMOD}.kld
Modified: trunk/kfreebsd-7/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/902_version.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/902_version.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,7 +1,7 @@
Index: sys/conf/newvers.sh
===================================================================
---- sys/conf/newvers.sh.orig 2006-06-24 17:10:55.000000000 +0200
-+++ sys/conf/newvers.sh 2006-06-24 17:38:49.000000000 +0200
+--- sys/conf/newvers.sh.orig 2007-12-09 13:17:59.696816000 +0100
++++ sys/conf/newvers.sh 2007-12-09 13:24:47.000000000 +0100
@@ -89,7 +89,7 @@
cat << EOF > vers.c
$COPYRIGHT
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,7 +1,7 @@
Index: sys/conf/files
===================================================================
---- sys/conf/files.orig
-+++ sys/conf/files
+--- sys/conf/files.orig 2007-12-09 13:17:59.330467000 +0100
++++ sys/conf/files 2007-12-09 13:24:47.000000000 +0100
@@ -469,17 +469,6 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
@@ -22,8 +22,8 @@
dev/awi/if_awi_pccard.c optional awi pccard
Index: sys/conf/files.i386
===================================================================
---- sys/conf/files.i386.orig
-+++ sys/conf/files.i386
+--- sys/conf/files.i386.orig 2007-12-09 13:17:59.362133000 +0100
++++ sys/conf/files.i386 2007-12-09 13:24:47.000000000 +0100
@@ -46,42 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
@@ -95,8 +95,8 @@
dev/sbni/if_sbni_pci.c optional sbni pci
Index: sys/conf/kern.pre.mk
===================================================================
---- sys/conf/kern.pre.mk.orig
-+++ sys/conf/kern.pre.mk
+--- sys/conf/kern.pre.mk.orig 2007-12-09 13:17:59.394111000 +0100
++++ sys/conf/kern.pre.mk 2007-12-09 13:24:47.000000000 +0100
@@ -67,9 +67,6 @@
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -109,8 +109,8 @@
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig
-+++ sys/i386/conf/GENERIC
+--- sys/i386/conf/GENERIC.orig 2007-12-09 13:17:59.471217000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:25:22.166513000 +0100
@@ -128,8 +128,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
@@ -122,8 +122,8 @@
device mly # Mylex AcceleRAID/eXtremeRAID
Index: sys/modules/Makefile
===================================================================
---- sys/modules/Makefile.orig
-+++ sys/modules/Makefile
+--- sys/modules/Makefile.orig 2007-12-09 13:17:59.507637000 +0100
++++ sys/modules/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -25,11 +25,6 @@
${_arl} \
${_asr} \
@@ -291,8 +291,8 @@
_i2c= i2c
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig
-+++ sys/amd64/conf/GENERIC
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 13:17:59.557535000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:25:22.217345000 +0100
@@ -121,8 +121,6 @@
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
@@ -304,8 +304,8 @@
device mly # Mylex AcceleRAID/eXtremeRAID
Index: sys/conf/files.amd64
===================================================================
---- sys/conf/files.amd64.orig
-+++ sys/conf/files.amd64
+--- sys/conf/files.amd64.orig 2007-12-09 13:17:59.430662000 +0100
++++ sys/conf/files.amd64 2007-12-09 13:24:47.000000000 +0100
@@ -47,35 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
Modified: trunk/kfreebsd-7/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -3,9 +3,9 @@
Index: sys/dev/null/null.c
===================================================================
---- sys/dev/null/null.c.orig 2005-02-27 23:00:45.000000000 +0100
-+++ sys/dev/null/null.c 2006-06-24 17:42:51.000000000 +0200
-@@ -42,13 +42,16 @@
+--- sys/dev/null/null.c.orig 2007-12-09 13:17:59.091708000 +0100
++++ sys/dev/null/null.c 2007-12-09 13:24:47.000000000 +0100
+@@ -43,13 +43,16 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -22,7 +22,7 @@
#define ZERO_MINOR 12
static struct cdevsw null_cdevsw = {
-@@ -59,6 +62,14 @@
+@@ -60,6 +63,14 @@
.d_name = "null",
};
@@ -37,7 +37,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -80,6 +91,15 @@
+@@ -81,6 +92,15 @@
/* ARGSUSED */
static int
@@ -53,7 +53,7 @@
null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
int flags __unused, struct thread *td)
{
-@@ -116,12 +136,15 @@
+@@ -117,12 +137,15 @@
zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -24,9 +24,9 @@
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig 2006-06-24 17:39:05.000000000 +0200
-+++ sys/i386/conf/GENERIC 2006-06-24 17:42:59.000000000 +0200
-@@ -53,8 +53,14 @@
+--- sys/i386/conf/GENERIC.orig 2007-12-09 13:24:47.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:25:00.391532000 +0100
+@@ -55,8 +55,14 @@
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
@@ -40,12 +40,12 @@
+options SEMMAP=256
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
- options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
+ options ADAPTIVE_GIANT # Giant mutex is adaptive.
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig 2006-06-24 17:41:46.000000000 +0200
-+++ sys/amd64/conf/GENERIC 2006-06-24 17:42:59.000000000 +0200
-@@ -54,8 +54,14 @@
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 13:24:47.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:25:00.320142000 +0100
+@@ -55,8 +55,14 @@
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
@@ -59,4 +59,4 @@
+options SEMMAP=256
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
- options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
+ options ADAPTIVE_GIANT # Giant mutex is adaptive.
Modified: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -3,9 +3,9 @@
Index: sys/i386/i386/identcpu.c
===================================================================
---- sys/i386/i386/identcpu.c.orig 2006-04-24 20:24:30.000000000 +0200
-+++ sys/i386/i386/identcpu.c 2006-06-24 17:43:03.000000000 +0200
-@@ -611,6 +611,7 @@
+--- sys/i386/i386/identcpu.c.orig 2007-12-09 13:17:58.684647000 +0100
++++ sys/i386/i386/identcpu.c 2007-12-09 13:24:47.000000000 +0100
+@@ -643,6 +643,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -13,7 +13,7 @@
bzero_vector = i486_bzero;
break;
#endif
-@@ -621,6 +622,7 @@
+@@ -653,6 +654,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -21,7 +21,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -630,6 +632,7 @@
+@@ -662,6 +664,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
Modified: trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,8 +1,8 @@
Index: sys/compat/linprocfs/linprocfs.c
===================================================================
---- sys/compat/linprocfs/linprocfs.c.orig 2006-06-24 17:33:15.000000000 +0200
-+++ sys/compat/linprocfs/linprocfs.c 2006-06-24 17:43:07.000000000 +0200
-@@ -381,10 +381,6 @@
+--- sys/compat/linprocfs/linprocfs.c.orig 2007-12-09 13:17:58.550924000 +0100
++++ sys/compat/linprocfs/linprocfs.c 2007-12-09 13:24:47.000000000 +0100
+@@ -336,10 +336,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
@@ -11,5 +11,5 @@
- else if (strcmp(fstype, "procfs") == 0)
- continue;
- sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype,
- mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
+ if (strcmp(fstype, "linsysfs") == 0) {
+ sbuf_printf(sb, "/sys %s sysfs %s", mntto,
Modified: trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,7 +1,7 @@
Index: sys/i386/conf/GENERIC.hints
===================================================================
---- sys/i386/conf/GENERIC.hints.orig 2005-01-14 07:54:59.000000000 +0100
-+++ sys/i386/conf/GENERIC.hints 2006-06-24 17:43:10.000000000 +0200
+--- sys/i386/conf/GENERIC.hints.orig 2007-12-09 13:17:58.365646000 +0100
++++ sys/i386/conf/GENERIC.hints 2007-12-09 13:24:47.000000000 +0100
@@ -27,6 +27,7 @@
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -12,10 +12,10 @@
hint.sc.0.flags="0x100"
Index: sys/amd64/conf/GENERIC.hints
===================================================================
---- sys/amd64/conf/GENERIC.hints.orig 2004-07-23 00:28:34.000000000 +0200
-+++ sys/amd64/conf/GENERIC.hints 2006-06-24 17:43:10.000000000 +0200
-@@ -14,6 +14,7 @@
- hint.atkbd.0.flags="0x1"
+--- sys/amd64/conf/GENERIC.hints.orig 2007-12-09 13:17:58.415001000 +0100
++++ sys/amd64/conf/GENERIC.hints 2007-12-09 13:24:47.000000000 +0100
+@@ -13,6 +13,7 @@
+ hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
+hint.psm.0.flags="0x100"
Modified: trunk/kfreebsd-7/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -2,20 +2,20 @@
Index: sys/modules/hwpmc/Makefile
===================================================================
---- sys/modules/hwpmc/Makefile.orig 2006-06-25 11:03:50.000000000 +0200
-+++ sys/modules/hwpmc/Makefile 2006-06-25 11:04:06.000000000 +0200
+--- sys/modules/hwpmc/Makefile.orig 2007-12-09 13:17:58.185267000 +0100
++++ sys/modules/hwpmc/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,6 +9,7 @@
SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h
WARNS?= 2
+NO_WERROR?= 1
- .if ${MACHINE_ARCH} == "alpha"
- SRCS+= hwpmc_alpha.c
+ .if ${MACHINE_ARCH} == "amd64"
+ SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
Index: sys/modules/geom/geom_eli/Makefile
===================================================================
---- sys/modules/geom/geom_eli/Makefile 2007-05-30 18:49:24.000000000 +0200
-+++ sys/modules/geom/geom_eli/Makefile 2007-05-30 18:49:24.000000000 +0200
+--- sys/modules/geom/geom_eli/Makefile.orig 2007-12-09 13:17:58.239540000 +0100
++++ sys/modules/geom/geom_eli/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -12,5 +12,6 @@
SRCS+= pkcs5v2.c
SRCS+= vnode_if.h
Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,13 +1,14 @@
---- sys/conf/ldscript.amd64.orig 2007-01-01 23:54:36.000000000 +0100
-+++ sys/conf/ldscript.amd64 2007-01-01 23:55:05.000000000 +0100
-@@ -1,5 +1,5 @@
+Index: sys/conf/ldscript.amd64
+===================================================================
+--- sys/conf/ldscript.amd64.orig 2007-12-09 13:17:58.063583000 +0100
++++ sys/conf/ldscript.amd64 2007-12-09 13:24:47.000000000 +0100
+@@ -1,12 +1,12 @@
/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
OUTPUT_ARCH(i386:x86-64)
ENTRY(btext)
SEARCH_DIR("/usr/lib");
-@@ -6,7 +6,7 @@
SECTIONS
{
/* Read-only sections, merged into text segment: */
Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,6 +1,7 @@
-diff -ur sys.orig/modules/cxgb/Makefile sys/modules/cxgb/Makefile
---- sys.orig/modules/cxgb/Makefile 2007-05-30 18:42:07.000000000 +0200
-+++ sys/modules/cxgb/Makefile 2007-05-30 20:02:23.000000000 +0200
+Index: sys/modules/cxgb/Makefile
+===================================================================
+--- sys/modules/cxgb/Makefile.orig 2007-12-09 13:17:57.649081000 +0100
++++ sys/modules/cxgb/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -18,21 +18,21 @@
.if ${MACHINE_ARCH} != "ia64"
# ld is broken on ia64
@@ -26,9 +27,10 @@
| gzip -dc > ${.TARGET}
FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110
-diff -ur sys.orig/modules/ipwfw/ipw_bss/Makefile sys/modules/ipwfw/ipw_bss/Makefile
---- sys.orig/modules/ipwfw/ipw_bss/Makefile 2007-05-30 18:15:13.000000000 +0200
-+++ sys/modules/ipwfw/ipw_bss/Makefile 2007-05-30 20:03:15.000000000 +0200
+Index: sys/modules/ipwfw/ipw_bss/Makefile
+===================================================================
+--- sys/modules/ipwfw/ipw_bss/Makefile.orig 2007-12-09 13:17:57.685551000 +0100
++++ sys/modules/ipwfw/ipw_bss/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= ipw_bss
@@ -38,9 +40,10 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/ipwfw/ipw_ibss/Makefile sys/modules/ipwfw/ipw_ibss/Makefile
---- sys.orig/modules/ipwfw/ipw_ibss/Makefile 2007-05-30 18:15:13.000000000 +0200
-+++ sys/modules/ipwfw/ipw_ibss/Makefile 2007-05-30 20:03:23.000000000 +0200
+Index: sys/modules/ipwfw/ipw_ibss/Makefile
+===================================================================
+--- sys/modules/ipwfw/ipw_ibss/Makefile.orig 2007-12-09 13:17:57.722091000 +0100
++++ sys/modules/ipwfw/ipw_ibss/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= ipw_ibss
@@ -50,9 +53,10 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/ipwfw/ipw_monitor/Makefile sys/modules/ipwfw/ipw_monitor/Makefile
---- sys.orig/modules/ipwfw/ipw_monitor/Makefile 2007-05-30 18:15:13.000000000 +0200
-+++ sys/modules/ipwfw/ipw_monitor/Makefile 2007-05-30 20:03:35.000000000 +0200
+Index: sys/modules/ipwfw/ipw_monitor/Makefile
+===================================================================
+--- sys/modules/ipwfw/ipw_monitor/Makefile.orig 2007-12-09 13:17:57.762877000 +0100
++++ sys/modules/ipwfw/ipw_monitor/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= ipw_monitor
@@ -62,9 +66,10 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/iwifw/iwi_bss/Makefile sys/modules/iwifw/iwi_bss/Makefile
---- sys.orig/modules/iwifw/iwi_bss/Makefile 2007-05-30 18:15:14.000000000 +0200
-+++ sys/modules/iwifw/iwi_bss/Makefile 2007-05-30 20:03:56.000000000 +0200
+Index: sys/modules/iwifw/iwi_bss/Makefile
+===================================================================
+--- sys/modules/iwifw/iwi_bss/Makefile.orig 2007-12-09 13:17:57.799370000 +0100
++++ sys/modules/iwifw/iwi_bss/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= iwi_bss
@@ -74,9 +79,10 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/iwifw/iwi_ibss/Makefile sys/modules/iwifw/iwi_ibss/Makefile
---- sys.orig/modules/iwifw/iwi_ibss/Makefile 2007-05-30 18:15:14.000000000 +0200
-+++ sys/modules/iwifw/iwi_ibss/Makefile 2007-05-30 20:04:05.000000000 +0200
+Index: sys/modules/iwifw/iwi_ibss/Makefile
+===================================================================
+--- sys/modules/iwifw/iwi_ibss/Makefile.orig 2007-12-09 13:17:57.836207000 +0100
++++ sys/modules/iwifw/iwi_ibss/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= iwi_fw
@@ -86,9 +92,10 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/iwifw/iwi_monitor/Makefile sys/modules/iwifw/iwi_monitor/Makefile
---- sys.orig/modules/iwifw/iwi_monitor/Makefile 2007-05-30 18:15:14.000000000 +0200
-+++ sys/modules/iwifw/iwi_monitor/Makefile 2007-05-30 20:04:17.000000000 +0200
+Index: sys/modules/iwifw/iwi_monitor/Makefile
+===================================================================
+--- sys/modules/iwifw/iwi_monitor/Makefile.orig 2007-12-09 13:17:57.877377000 +0100
++++ sys/modules/iwifw/iwi_monitor/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,7 +9,7 @@
CLEANFILES= iwi_monitor
@@ -98,12 +105,13 @@
.include <bsd.kmod.mk>
-diff -ur sys.orig/modules/wpifw/Makefile sys/modules/wpifw/Makefile
---- sys.orig/modules/wpifw/Makefile
-+++ sys/modules/wpifw/Makefile
+Index: sys/modules/wpifw/Makefile
+===================================================================
+--- sys/modules/wpifw/Makefile.orig 2007-12-09 13:17:57.927450000 +0100
++++ sys/modules/wpifw/Makefile 2007-12-09 13:24:47.000000000 +0100
@@ -9,6 +9,6 @@
CLEANFILES= iwlwifi-3945-2.14.4.fw
- modules/wpifw/Makefile
+
iwlwifi-3945-2.14.4.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
- uudecode -p ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
+ uudecode -o- ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2007-12-09 12:09:30 UTC (rev 2073)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2007-12-09 12:44:05 UTC (rev 2074)
@@ -1,10 +1,10 @@
Index: sys/amd64/conf/GENERIC
===================================================================
---- sys/amd64/conf/GENERIC.orig 2007-05-30 13:26:20.000000000 +0200
-+++ sys/amd64/conf/GENERIC 2007-05-30 13:31:16.000000000 +0200
+--- sys/amd64/conf/GENERIC.orig 2007-12-09 13:24:47.000000000 +0100
++++ sys/amd64/conf/GENERIC 2007-12-09 13:24:47.000000000 +0100
@@ -18,13 +18,8 @@
#
- # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $
+ # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.1 2007/10/11 06:20:26 kensmith Exp $
-cpu HAMMER
-ident GENERIC
@@ -17,7 +17,7 @@
options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -43,6 +38,8 @@
+@@ -44,6 +39,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -26,7 +26,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -51,7 +47,7 @@
+@@ -52,7 +49,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -35,7 +35,7 @@
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
options SHMMAXPGS=4096
-@@ -83,9 +79,6 @@
+@@ -79,9 +76,6 @@
device acpi
device pci
@@ -45,7 +45,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -93,6 +86,8 @@
+@@ -89,6 +83,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -54,7 +54,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -175,10 +170,6 @@
+@@ -171,10 +167,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -65,9 +65,9 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -237,9 +228,6 @@
- device wlan_tkip # 802.11 TKIP support
- device wlan_amrr # AMRR transmit rate control algorithm
+@@ -236,9 +228,6 @@
+ device wlan_scan_ap # 802.11 AP mode scanning
+ device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
-device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
@@ -75,7 +75,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -248,13 +236,8 @@
+@@ -247,13 +236,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -89,7 +89,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -271,12 +254,8 @@
+@@ -270,12 +254,8 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -102,7 +102,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -292,3 +271,11 @@
+@@ -291,3 +271,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -116,11 +116,11 @@
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
Index: sys/i386/conf/GENERIC
===================================================================
---- sys/i386/conf/GENERIC.orig 2007-05-30 13:26:20.000000000 +0200
-+++ sys/i386/conf/GENERIC 2007-05-30 13:35:14.000000000 +0200
+--- sys/i386/conf/GENERIC.orig 2007-12-09 13:24:47.000000000 +0100
++++ sys/i386/conf/GENERIC 2007-12-09 13:24:47.000000000 +0100
@@ -18,15 +18,8 @@
#
- # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.468 2007/05/28 14:38:42 simokawa Exp $
+ # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.1 2007/10/11 06:20:26 kensmith Exp $
-cpu I486_CPU
-cpu I586_CPU
@@ -135,7 +135,7 @@
options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -44,6 +37,8 @@
+@@ -45,6 +38,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -144,7 +144,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -51,7 +46,7 @@
+@@ -52,7 +47,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -153,7 +153,7 @@
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
options SHMMAXPGS=4096
-@@ -84,9 +79,6 @@
+@@ -80,9 +75,6 @@
device eisa
device pci
@@ -163,7 +163,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -94,6 +86,8 @@
+@@ -90,6 +82,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -172,7 +172,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -186,10 +180,6 @@
+@@ -182,10 +176,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -183,9 +183,9 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -250,9 +240,6 @@
- device wlan_tkip # 802.11 TKIP support
- device wlan_amrr # AMRR transmit rate control algorithm
+@@ -249,9 +239,6 @@
+ device wlan_scan_ap # 802.11 AP mode scanning
+ device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
-device ath # Atheros pci/cardbus NIC's
-device ath_hal # Atheros HAL (Hardware Access Layer)
@@ -193,7 +193,7 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-@@ -262,13 +249,8 @@
+@@ -261,13 +248,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -207,7 +207,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -285,13 +267,9 @@
+@@ -284,13 +266,9 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -221,7 +221,7 @@
# USB Ethernet, requires miibus
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
-@@ -307,3 +285,11 @@
+@@ -306,3 +284,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list