[Glibc-bsd-commits] r3225 - in trunk/kfreebsd-8/debian: . patches
Robert Millan
rmh at alioth.debian.org
Mon Jan 10 19:36:55 UTC 2011
Author: rmh
Date: 2011-01-10 19:36:53 +0000 (Mon, 10 Jan 2011)
New Revision: 3225
Removed:
trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff
trunk/kfreebsd-8/debian/patches/000_ata.diff
trunk/kfreebsd-8/debian/patches/000_ufs_lookup.diff
trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff
trunk/kfreebsd-8/debian/patches/104_linprocfs.diff
Modified:
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/004_xargs.diff
trunk/kfreebsd-8/debian/patches/904_dev_full.diff
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-8/debian/rules
Log:
* New upstream release.
- 000_adaptive_machine_arch.diff: Remove (merged).
- 000_ata.diff: Remove (merged).
- 000_ufs_lookup.diff: Remove (merged).
- 004_xargs.diff: Resync.
- 102_POLL_HUP.diff: Remove (merged).
- 104_linprocfs.diff: Remove (merged).
- 904_dev_full.diff: Resync.
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/changelog 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,3 +1,16 @@
+kfreebsd-8 (8.2~rc1+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - 000_adaptive_machine_arch.diff: Remove (merged).
+ - 000_ata.diff: Remove (merged).
+ - 000_ufs_lookup.diff: Remove (merged).
+ - 004_xargs.diff: Resync.
+ - 102_POLL_HUP.diff: Remove (merged).
+ - 104_linprocfs.diff: Remove (merged).
+ - 904_dev_full.diff: Resync.
+
+ -- Robert Millan <rmh at debian.org> Mon, 10 Jan 2011 16:27:34 +0100
+
kfreebsd-8 (8.1+dfsg-7.1) unstable; urgency=high
* Non-maintainer upload (requested by Petr Salinger).
Deleted: trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,125 +0,0 @@
-When compat32 binary asks for the value of hw.machine_arch, report the
-name of 32bit sibling architecture instead of the host one. Do the
-same for hw.machine on amd64.
-
-Add a safety belt debug.adaptive_machine_arch sysctl, to turn the
-substitution off.
-
-
-Compared to upstream, we return i686, not i386 on amd64 for sysctl hw.machine
-This part have to be moved into 907_cpu_class.diff later.
-
-
---- a/sys/powerpc/include/param.h
-+++ b/sys/powerpc/include/param.h
-@@ -69,6 +69,11 @@
- #define MACHINE_ARCH "powerpc"
- #endif
- #define MID_MACHINE MID_POWERPC
-+#ifdef __powerpc64__
-+#ifndef MACHINE_ARCH32
-+#define MACHINE_ARCH32 "powerpc"
-+#endif
-+#endif
-
- #if defined(SMP) || defined(KLD_MODULE)
- #define MAXCPU 2
---- a/sys/kern/kern_mib.c
-+++ b/sys/kern/kern_mib.c
-@@ -232,11 +232,33 @@
- SYSCTL_PROC(_hw, OID_AUTO, pagesizes, CTLTYPE_ULONG | CTLFLAG_RD,
- NULL, 0, sysctl_hw_pagesizes, "LU", "Supported page sizes");
-
--static char machine_arch[] = MACHINE_ARCH;
--SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD,
-- machine_arch, 0, "System architecture");
-+#ifdef SCTL_MASK32
-+int adaptive_machine_arch = 1;
-+SYSCTL_INT(_debug, OID_AUTO, adaptive_machine_arch, CTLFLAG_RW,
-+ &adaptive_machine_arch, 1,
-+ "Adapt reported machine architecture to the ABI of the binary");
-+#endif
-
- static int
-+sysctl_hw_machine_arch(SYSCTL_HANDLER_ARGS)
-+{
-+ int error;
-+ static const char machine_arch[] = MACHINE_ARCH;
-+#ifdef SCTL_MASK32
-+ static const char machine_arch32[] = MACHINE_ARCH32;
-+
-+ if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch)
-+ error = SYSCTL_OUT(req, machine_arch32, sizeof(machine_arch32));
-+ else
-+#endif
-+ error = SYSCTL_OUT(req, machine_arch, sizeof(machine_arch));
-+ return (error);
-+
-+}
-+SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD,
-+ NULL, 0, sysctl_hw_machine_arch, "A", "System architecture");
-+
-+static int
- sysctl_hostname(SYSCTL_HANDLER_ARGS)
- {
- struct prison *pr, *cpr;
---- a/sys/ia64/include/param.h
-+++ b/sys/ia64/include/param.h
-@@ -57,6 +57,9 @@
- #ifndef MACHINE_ARCH
- #define MACHINE_ARCH "ia64"
- #endif
-+#ifndef MACHINE_ARCH32
-+#define MACHINE_ARCH32 "i386"
-+#endif
-
- #if defined(SMP) || defined(KLD_MODULE)
- #define MAXCPU 32
---- a/sys/amd64/include/param.h
-+++ b/sys/amd64/include/param.h
-@@ -59,6 +59,9 @@
- #ifndef MACHINE_ARCH
- #define MACHINE_ARCH "amd64"
- #endif
-+#ifndef MACHINE_ARCH32
-+#define MACHINE_ARCH32 "i386"
-+#endif
-
- #if defined(SMP) || defined(KLD_MODULE)
- #define MAXCPU 32
---- a/sys/amd64/amd64/identcpu.c
-+++ b/sys/amd64/amd64/identcpu.c
-@@ -76,9 +76,31 @@
-
- int cpu_class;
- char machine[] = "amd64";
--SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD,
-- machine, 0, "Machine class");
-
-+#ifdef SCTL_MASK32
-+extern int adaptive_machine_arch;
-+#endif
-+
-+static int
-+sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
-+{
-+#ifdef SCTL_MASK32
-+ static const char machine32[] = "i686";
-+#endif
-+ int error;
-+
-+#ifdef SCTL_MASK32
-+ if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch)
-+ error = SYSCTL_OUT(req, machine32, sizeof(machine32));
-+ else
-+#endif
-+ error = SYSCTL_OUT(req, machine, sizeof(machine));
-+ return (error);
-+
-+}
-+SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD,
-+ NULL, 0, sysctl_hw_machine, "A", "Machine class");
-+
- static char cpu_model[128];
- SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD,
- cpu_model, 0, "Machine model");
Deleted: trunk/kfreebsd-8/debian/patches/000_ata.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_ata.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/000_ata.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,16 +0,0 @@
-A legacy device detection in the ata(4) can fail in some cases.
-Specifically, Marvell 88SX6141 controllers can cause attach failure or panic.
-This problem has been fixed in r210168 (HEAD). An Errata Notice for 8.1-RELEASE is planned.
-
---- head/sys/dev/ata/ata-pci.c 2010/07/16 17:01:36 210167
-+++ head/sys/dev/ata/ata-pci.c 2010/07/16 17:27:43 210168
-@@ -769,7 +769,8 @@
- int
- ata_legacy(device_t dev)
- {
-- return (((pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV)&&
-+ return (((pci_read_config(dev, PCIR_SUBCLASS, 1) == PCIS_STORAGE_IDE) &&
-+ (pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV)&&
- ((pci_read_config(dev, PCIR_PROGIF, 1) &
- (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC)) !=
- (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC))) ||
Deleted: trunk/kfreebsd-8/debian/patches/000_ufs_lookup.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_ufs_lookup.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/000_ufs_lookup.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,52 +0,0 @@
-A deadlock can occur in UFS with the QUOTA enabled due to a lock order reversal.
-This problem has been fixed in r209367 (HEAD). An Errata Notice for 8.1-RELEASE is planned.
-
---- a/sys/ufs/ufs/ufs_lookup.c
-+++ b/sys/ufs/ufs/ufs_lookup.c
-@@ -80,6 +80,32 @@
- static int ufs_lookup_(struct vnode *, struct vnode **, struct componentname *,
- ino_t *);
-
-+#ifdef QUOTA
-+static int
-+ufs_lookup_upgrade_lock(struct vnode *vp)
-+{
-+ int error;
-+
-+ ASSERT_VOP_LOCKED(vp, __FUNCTION__);
-+ if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE)
-+ return (0);
-+
-+ error = 0;
-+
-+ /*
-+ * Upgrade vnode lock, since getinoquota()
-+ * requires exclusive lock to modify inode.
-+ */
-+ vhold(vp);
-+ vn_lock(vp, LK_UPGRADE | LK_RETRY);
-+ VI_LOCK(vp);
-+ if (vp->v_iflag & VI_DOOMED)
-+ error = ENOENT;
-+ vdropl(vp);
-+ return (error);
-+}
-+#endif
-+
- static int
- ufs_delete_denied(struct vnode *vdp, struct vnode *tdp, struct ucred *cred,
- struct thread *td)
-@@ -235,6 +261,13 @@
- vnode_create_vobject(vdp, DIP(dp, i_size), cnp->cn_thread);
-
- bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
-+#ifdef QUOTA
-+ if ((nameiop == DELETE || nameiop == RENAME) && (flags & ISLASTCN)) {
-+ error = ufs_lookup_upgrade_lock(vdp);
-+ if (error != 0)
-+ return (error);
-+ }
-+#endif
-
- restart:
- bp = NULL;
Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,9 +1,10 @@
Status: xargs -J option requested to both upstream and debian.
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -203,7 +203,7 @@
+diff -ur a/sys/conf/kmod.mk b/sys/conf/kmod.mk
+--- a/sys/conf/kmod.mk 2010-07-22 20:47:41.000000000 +0200
++++ b/sys/conf/kmod.mk 2010-11-09 00:29:56.000000000 +0100
+@@ -220,7 +220,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -11,19 +12,21 @@
+ export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
.endif
.endif
- .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
---- a/sys/contrib/dev/acpica/acpica_prep.sh
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -58,10 +58,10 @@
+ .if !defined(DEBUG_FLAGS) && \
+Només a b/sys/conf: kmod.mk.orig
+diff -ur a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
+--- a/sys/contrib/dev/acpica/acpica_prep.sh 2010-07-06 22:57:28.000000000 +0200
++++ b/sys/contrib/dev/acpica/acpica_prep.sh 2010-11-09 00:30:19.000000000 +0100
+@@ -59,10 +59,10 @@
# copy files
echo copying full dirs
for i in ${fulldirs}; do
-- find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
-+ find ${wrk} -name ${i} -type d | xargs -I % mv % ${dst}
+- find ${wrk} -name ${i} -type d -print | xargs -J % mv % ${dst}
++ find ${wrk} -name ${i} -type d -print | xargs -I % mv % ${dst}
done
echo copying remaining files
--find ${wrk} -type f | xargs -J % mv % ${dst}
-+find ${wrk} -type f | xargs -I % mv % ${dst}
+-find ${wrk} -type f -print | xargs -J % mv % ${dst}
++find ${wrk} -type f -print | xargs -I % mv % ${dst}
# canonify include paths
for H in ${src_headers}; do
Deleted: trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/102_POLL_HUP.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,19 +0,0 @@
-
-POLL_ERR and POLL_HUP are defined identically, looks like a typo,
-The same value causes problems for "case POLL_ERR:", "case POLL_HUP:" handling.
-It doesn't look like kernel generates these codes so far.
-
-http://www.freebsd.org/cgi/query-pr.cgi?pr=126076
-
-
---- a/sys/sys/signal.h
-+++ b/sys/sys/signal.h
-@@ -284,7 +284,7 @@
- #define POLL_MSG 3 /* Input message available */
- #define POLL_ERR 4 /* I/O Error */
- #define POLL_PRI 5 /* High priority input available */
--#define POLL_HUP 4 /* Device disconnected */
-+#define POLL_HUP 6 /* Device disconnected */
-
- #endif
-
Deleted: trunk/kfreebsd-8/debian/patches/104_linprocfs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/104_linprocfs.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/104_linprocfs.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,138 +0,0 @@
-
-Improve linprocfs, see #344546, #521304, #460331
-for other/related problems.
-
-Submitted as
-http://www.freebsd.org/cgi/query-pr.cgi?pr=144584
-
---- a/sys/compat/linprocfs/linprocfs.c
-+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -110,13 +110,36 @@
- /*
- * Various conversion macros
- */
-+
-+/* The LINUX_USER_HZ is assumed 100 for now */
-+
-+#if defined(__i386__)
-+/* we need intermediate result as 64 bit, otherwise it overflows too early */
-+#define DO64_MULDIV(v,m,d) \
-+({ \
-+ unsigned long rv0; \
-+ unsigned long rv1; \
-+ __asm__ __volatile__( \
-+ "mull %1\n\t" \
-+ "divl %2\n\t" \
-+ :"=a" (rv0), "=d" (rv1) \
-+ :"r" (d), "0" (v), "1" (m) \
-+ :"cc" ); \
-+ rv0; \
-+})
-+
-+#define T2J(x) DO64_MULDIV((x), 100UL, (stathz ? stathz : hz)) /* ticks to jiffies */
-+#else
- #define T2J(x) (((x) * 100UL) / (stathz ? stathz : hz)) /* ticks to jiffies */
-+#endif
- #define T2S(x) ((x) / (stathz ? stathz : hz)) /* ticks to seconds */
- #define B2K(x) ((x) >> 10) /* bytes to kbytes */
- #define B2P(x) ((x) >> PAGE_SHIFT) /* bytes to pages */
- #define P2B(x) ((x) << PAGE_SHIFT) /* pages to bytes */
- #define P2K(x) ((x) << (PAGE_SHIFT - 10)) /* pages to kbytes */
-
-+#define TV2J(x) (((x)->tv_sec) * 100UL + ((x)->tv_usec) / 10000)
-+
- /**
- * @brief Mapping of ki_stat in struct kinfo_proc to the linux state
- *
-@@ -502,12 +525,24 @@
- {
- long cp_time[CPUSTATES];
- struct timeval tv;
-+ int cnt, i;
-
- getmicrouptime(&tv);
- read_cpu_time(cp_time);
-+
-+ for (cnt = 0, i = 0; i <= mp_maxid; ++i)
-+ if (!(CPU_ABSENT(i)))
-+ cnt++;
-+
-+ if (!cnt)
-+ cnt = 1;
-+
-+ i = ((cp_time[CP_IDLE])/cnt) % (stathz ? stathz : hz);
-+ i = (i * 100) / (stathz ? stathz : hz);
-+
- sbuf_printf(sb, "%lld.%02ld %ld.%02ld\n",
- (long long)tv.tv_sec, tv.tv_usec / 10000,
-- T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100);
-+ T2S((cp_time[CP_IDLE]/cnt)), i);
- return (0);
- }
-
-@@ -613,9 +648,17 @@
- struct kinfo_proc kp;
- char state;
- static int ratelimit = 0;
-+ unsigned long startcode, startdata;
-
- PROC_LOCK(p);
- fill_kinfo_proc(p, &kp);
-+ if (p->p_vmspace) {
-+ startcode = (unsigned long) p->p_vmspace->vm_taddr;
-+ startdata = (unsigned long) p->p_vmspace->vm_daddr;
-+ } else {
-+ startcode = 0;
-+ startdata = 0;
-+ };
- sbuf_printf(sb, "%d", p->p_pid);
- #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg)
- PS_ADD("comm", "(%s)", p->p_comm);
-@@ -634,30 +677,27 @@
- PS_ADD("pgrp", "%d", p->p_pgid);
- PS_ADD("session", "%d", p->p_session->s_sid);
- PROC_UNLOCK(p);
-- PS_ADD("tty", "%d", 0); /* XXX */
-+ PS_ADD("tty", "%d", kp.ki_tdev);
- PS_ADD("tpgid", "%d", kp.ki_tpgid);
- PS_ADD("flags", "%u", 0); /* XXX */
- PS_ADD("minflt", "%lu", kp.ki_rusage.ru_minflt);
- PS_ADD("cminflt", "%lu", kp.ki_rusage_ch.ru_minflt);
- PS_ADD("majflt", "%lu", kp.ki_rusage.ru_majflt);
- PS_ADD("cmajflt", "%lu", kp.ki_rusage_ch.ru_majflt);
-- PS_ADD("utime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_utime)));
-- PS_ADD("stime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_stime)));
-- PS_ADD("cutime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_utime)));
-- PS_ADD("cstime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_stime)));
-+ PS_ADD("utime", "%ld", TV2J((&kp.ki_rusage.ru_utime)));
-+ PS_ADD("stime", "%ld", TV2J((&kp.ki_rusage.ru_stime)));
-+ PS_ADD("cutime", "%ld", TV2J((&kp.ki_rusage_ch.ru_utime)));
-+ PS_ADD("cstime", "%ld", TV2J((&kp.ki_rusage_ch.ru_stime)));
- PS_ADD("priority", "%d", kp.ki_pri.pri_user);
- PS_ADD("nice", "%d", kp.ki_nice); /* 19 (nicest) to -19 */
- PS_ADD("0", "%d", 0); /* removed field */
- PS_ADD("itrealvalue", "%d", 0); /* XXX */
-- /* XXX: starttime is not right, it is the _same_ for _every_ process.
-- It should be the number of jiffies between system boot and process
-- start. */
-- PS_ADD("starttime", "%lu", T2J(tvtohz(&kp.ki_start)));
-+ PS_ADD("starttime", "%lu", TV2J((&kp.ki_start)) - TV2J((&boottime)));
- PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size));
- PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize);
- PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss);
-- PS_ADD("startcode", "%u", (unsigned)0);
-- PS_ADD("endcode", "%u", 0); /* XXX */
-+ PS_ADD("startcode", "%lu", startcode);
-+ PS_ADD("endcode", "%lu", startdata);
- PS_ADD("startstack", "%u", 0); /* XXX */
- PS_ADD("kstkesp", "%u", 0); /* XXX */
- PS_ADD("kstkeip", "%u", 0); /* XXX */
-@@ -800,7 +840,7 @@
- */
- sbuf_printf(sb, "VmSize:\t%8ju kB\n", B2K((uintmax_t)kp.ki_size));
- sbuf_printf(sb, "VmLck:\t%8u kB\n", P2K(0)); /* XXX */
-- sbuf_printf(sb, "VmRss:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize));
-+ sbuf_printf(sb, "VmRSS:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize));
- sbuf_printf(sb, "VmData:\t%8ju kB\n", P2K((uintmax_t)kp.ki_dsize));
- sbuf_printf(sb, "VmStk:\t%8ju kB\n", P2K((uintmax_t)kp.ki_ssize));
- sbuf_printf(sb, "VmExe:\t%8ju kB\n", P2K((uintmax_t)kp.ki_tsize));
Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-01-10 19:36:53 UTC (rev 3225)
@@ -2,9 +2,10 @@
Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
/dev/full already rejected in upstream (kern/68961)
---- a/sys/dev/null/null.c
-+++ b/sys/dev/null/null.c
-@@ -43,13 +43,16 @@
+diff -ur a/sys/dev/null/null.c b/sys/dev/null/null.c
+--- a/sys/dev/null/null.c 2010-08-06 11:47:48.000000000 +0200
++++ b/sys/dev/null/null.c 2010-11-09 00:41:11.000000000 +0100
+@@ -43,9 +43,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -16,12 +17,7 @@
static d_ioctl_t null_ioctl;
static d_read_t zero_read;
- #define NULL_MINOR 2
-+#define FULL_MINOR 3
- #define ZERO_MINOR 12
-
- static struct cdevsw null_cdevsw = {
-@@ -60,6 +63,14 @@
+@@ -57,6 +59,14 @@
.d_name = "null",
};
@@ -36,7 +32,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -81,11 +92,25 @@
+@@ -78,11 +88,25 @@
/* ARGSUSED */
static int
@@ -62,14 +58,14 @@
if (cmd != DIOCSKERNELDUMP)
return (ENOIOCTL);
error = priv_check(td, PRIV_SETDUMPER);
-@@ -117,12 +142,15 @@
+@@ -114,12 +138,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");
-+ full_dev = make_dev(&full_cdevsw, FULL_MINOR, UID_ROOT,
-+ GID_WHEEL, 0666, "full");
- zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT,
- GID_WHEEL, 0666, "zero");
+ null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
+ NULL, UID_ROOT, GID_WHEEL, 0666, "null");
++ null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
++ NULL, UID_ROOT, GID_WHEEL, 0666, "full");
+ zero_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &zero_cdevsw, 0,
+ NULL, UID_ROOT, GID_WHEEL, 0666, "zero");
break;
case MOD_UNLOAD:
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/patches/series 2011-01-10 19:36:53 UTC (rev 3225)
@@ -1,7 +1,4 @@
-000_adaptive_machine_arch.diff
-000_ata.diff
000_coda.diff
-000_ufs_lookup.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
@@ -11,10 +8,8 @@
013_ip_packed.diff
020_linker.diff
021_superpages_i386.diff
-102_POLL_HUP.diff
103_stat_pipe.diff
-104_linprocfs.diff
-105_apm_amd64.diff
+#105_apm_amd64.diff
106_teken_op.diff
107_mount_update.diff
108_teken_utf8_table.diff
@@ -22,7 +17,7 @@
903_disable_non-free_drivers.diff
904_dev_full.diff
906_grow_sysv_ipc_limits.diff
-907_cpu_class.diff
+#907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
912_binutils.diff
@@ -34,4 +29,4 @@
#918_delete_key.diff
950_no_stack_protector.diff
999_config.diff
-999_firmware.diff
+#999_firmware.diff
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2011-01-10 15:04:25 UTC (rev 3224)
+++ trunk/kfreebsd-8/debian/rules 2011-01-10 19:36:53 UTC (rev 3225)
@@ -19,8 +19,8 @@
configfile := DEBCUSTOM
abiname := 1
-SVN := http://svn.freebsd.org/base/release/$(version).0
-#SVN := http://svn.freebsd.org/base/stable/8
+#SVN := http://svn.freebsd.org/base/release/$(version).0
+SVN := http://svn.freebsd.org/base/stable/8
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
More information about the Glibc-bsd-commits
mailing list