[Glibc-bsd-commits] r3453 - trunk/kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Wed Jun 15 21:48:09 UTC 2011
Author: rmh
Date: 2011-06-15 21:48:09 +0000 (Wed, 15 Jun 2011)
New Revision: 3453
Removed:
trunk/kfreebsd-9/debian/patches/000_coda.diff
trunk/kfreebsd-9/debian/patches/000_t_delta_warning.diff
trunk/kfreebsd-9/debian/patches/021_superpages_i386.diff
trunk/kfreebsd-9/debian/patches/106_teken_op.diff
trunk/kfreebsd-9/debian/patches/912_binutils.diff
trunk/kfreebsd-9/debian/patches/917_track_alignment.diff
Modified:
trunk/kfreebsd-9/debian/patches/series
Log:
removed merged patches
Deleted: trunk/kfreebsd-9/debian/patches/000_coda.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_coda.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/000_coda.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,50 +0,0 @@
---- a/sys/fs/coda/coda.h
-+++ b/sys/fs/coda/coda.h
-@@ -41,7 +41,9 @@
- #ifndef _CODA_HEADER_
- #define _CODA_HEADER_
-
-+#ifdef _KERNEL
- #include "opt_coda.h" /* for CODA_COMPAT_5 option */
-+#endif
-
- /* Avoid CODA_COMPAT_5 redefinition in coda5 module */
- #if defined (CODA5_MODULE) && !defined(CODA_COMPAT_5)
-@@ -782,8 +784,8 @@
- #define PIOCPARM_MASK 0x0000ffff
- struct ViceIoctl {
- caddr_t in, out; /* Data to be transferred in, or out */
-- short in_size; /* Size of input buffer <= 2K */
-- short out_size; /* Maximum size of output buffer, <= 2K */
-+ unsigned short in_size; /* Size of input buffer <= 8K */
-+ unsigned short out_size; /* Maximum size of output buffer, <= 8K */
- };
-
- #if defined(__CYGWIN32__) || defined(DJGPP)
---- a/sys/fs/coda/coda_venus.c
-+++ b/sys/fs/coda/coda_venus.c
-@@ -274,6 +274,12 @@
- tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
- inp->cmd |= (tmp & IOCPARM_MASK) << 16;
-
-+ if (iap->vi.in_size > VC_MAXMSGSIZE ||
-+ iap->vi.out_size > VC_MAXMSGSIZE) {
-+ CODA_FREE(inp, coda_ioctl_size);
-+ return (EINVAL);
-+ }
-+
- inp->rwflag = flag;
- inp->len = iap->vi.in_size;
- inp->data = (char *)(sizeof (struct coda_ioctl_in));
---- a/sys/fs/coda/coda_vnops.c
-+++ b/sys/fs/coda/coda_vnops.c
-@@ -471,7 +471,8 @@
- iap->path)););
- return (EINVAL);
- }
-- if (iap->vi.in_size > VC_MAXDATASIZE) {
-+ if (iap->vi.in_size > VC_MAXDATASIZE ||
-+ iap->vi.out_size > VC_MAXDATASIZE) {
- NDFREE(&ndp, 0);
- return (EINVAL);
- }
Deleted: trunk/kfreebsd-9/debian/patches/000_t_delta_warning.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_t_delta_warning.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/000_t_delta_warning.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,63 +0,0 @@
-
-Backport from upstream trunk (r209900)
-
---- a/sys/kern/kern_tc.c
-+++ b/sys/kern/kern_tc.c
-@@ -864,43 +864,21 @@
- t_delta = t_this;
- bintime_sub(&t_delta, &t_last);
- /*
-- * Validate that 16 +/- 1/256 seconds passed.
-- * After division by 16 this gives us a precision of
-- * roughly 250PPM which is sufficient
-+ * Headroom:
-+ * 2^(64-20) / 16[s] =
-+ * 2^(44) / 16[s] =
-+ * 17.592.186.044.416 / 16 =
-+ * 1.099.511.627.776 [Hz]
- */
-- if (t_delta.sec > 16 || (
-- t_delta.sec == 16 && t_delta.frac >= (0x01LL << 56))) {
-- /* too long */
-- if (bootverbose)
-- printf("t_delta %ju.%016jx too long\n",
-- (uintmax_t)t_delta.sec,
-- (uintmax_t)t_delta.frac);
-- } else if (t_delta.sec < 15 ||
-- (t_delta.sec == 15 && t_delta.frac <= (0xffLL << 56))) {
-- /* too short */
-- if (bootverbose)
-- printf("t_delta %ju.%016jx too short\n",
-- (uintmax_t)t_delta.sec,
-- (uintmax_t)t_delta.frac);
-- } else {
-- /* just right */
-- /*
-- * Headroom:
-- * 2^(64-20) / 16[s] =
-- * 2^(44) / 16[s] =
-- * 17.592.186.044.416 / 16 =
-- * 1.099.511.627.776 [Hz]
-- */
-- divi = t_delta.sec << 20;
-- divi |= t_delta.frac >> (64 - 20);
-- c_delta <<= 20;
-- c_delta /= divi;
-- if (c_delta > cpu_tick_frequency) {
-- if (0 && bootverbose)
-- printf("cpu_tick increased to %ju Hz\n",
-- c_delta);
-- cpu_tick_frequency = c_delta;
-- }
-+ divi = t_delta.sec << 20;
-+ divi |= t_delta.frac >> (64 - 20);
-+ c_delta <<= 20;
-+ c_delta /= divi;
-+ if (c_delta > cpu_tick_frequency) {
-+ if (0 && bootverbose)
-+ printf("cpu_tick increased to %ju Hz\n",
-+ c_delta);
-+ cpu_tick_frequency = c_delta;
- }
- }
- c_last = c_this;
Deleted: trunk/kfreebsd-9/debian/patches/021_superpages_i386.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/021_superpages_i386.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/021_superpages_i386.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,11 +0,0 @@
---- a/sys/i386/i386/pmap.c
-+++ b/sys/i386/i386/pmap.c
-@@ -217,7 +217,7 @@
-
- SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
-
--static int pg_ps_enabled;
-+static int pg_ps_enabled = 1;
- SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
- "Are large page mappings enabled?");
-
Deleted: trunk/kfreebsd-9/debian/patches/106_teken_op.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/106_teken_op.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/106_teken_op.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,33 +0,0 @@
---- a/sys/dev/syscons/teken/teken_subr_compat.h
-+++ b/sys/dev/syscons/teken/teken_subr_compat.h
-@@ -75,6 +75,20 @@
- (duration & 0xffff));
- }
-
-+static void
-+teken_subr_cons25_set_graphic_rendition(teken_t *t, unsigned int cmd,
-+ unsigned int param __unused)
-+{
-+
-+ switch (cmd) {
-+ case 0: /* Reset. */
-+ t->t_curattr = t->t_defattr;
-+ break;
-+ default:
-+ teken_printf("unsupported attribute %u\n", cmd);
-+ }
-+}
-+
- #if 0
- static void
- teken_subr_vt52_decid(teken_t *t)
---- a/sys/dev/syscons/teken/sequences
-+++ b/sys/dev/syscons/teken/sequences
-@@ -104,6 +104,7 @@
- C25ADFG Cons25 set adapter foreground ^[ [ = F r
- C25BLPD Cons25 set bell pitch duration ^[ [ = B r r
- C25CURS Cons25 set cursor type ^[ [ = S r
-+C25SGR Cons25 set graphic rendition ^[ [ x r r
- C25VTSW Cons25 switch virtual terminal ^[ [ z r
-
- # VT52 compatibility
Deleted: trunk/kfreebsd-9/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/912_binutils.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/912_binutils.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,27 +0,0 @@
---- a/sys/conf/ldscript.amd64
-+++ b/sys/conf/ldscript.amd64
-@@ -1,12 +1,12 @@
- /* $FreeBSD$ */
--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");
- SECTIONS
- {
- /* Read-only sections, merged into text segment: */
-- . = kernbase + 0x00100000 + SIZEOF_HEADERS;
-+ . = kernbase + CONSTANT (MAXPAGESIZE) + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
-@@ -61,7 +61,8 @@
- .eh_frame_hdr : { *(.eh_frame_hdr) }
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
-- . = DATA_SEGMENT_ALIGN(0x100000, 0x1000);
-+ . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1));
-+ . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
- /* Ensure the __preinit_array_start label is properly aligned. We
- could instead move the label definition inside the section, but
- the linker would then create the section even if it turns out to
Deleted: trunk/kfreebsd-9/debian/patches/917_track_alignment.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/917_track_alignment.diff 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/917_track_alignment.diff 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,16 +0,0 @@
---- a/sys/geom/part/g_part_mbr.c
-+++ b/sys/geom/part/g_part_mbr.c
-@@ -416,13 +416,6 @@
- basetable->gpt_heads = heads;
- }
- }
-- if ((ent.dp_start % basetable->gpt_sectors) != 0)
-- printf("GEOM: %s: partition %d does not start on a "
-- "track boundary.\n", pp->name, index + 1);
-- if ((ent.dp_size % basetable->gpt_sectors) != 0)
-- printf("GEOM: %s: partition %d does not end on a "
-- "track boundary.\n", pp->name, index + 1);
--
- entry = (struct g_part_mbr_entry *)g_part_new_entry(basetable,
- index + 1, ent.dp_start, ent.dp_start + ent.dp_size - 1);
- entry->ent = ent;
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-06-15 21:25:09 UTC (rev 3452)
+++ trunk/kfreebsd-9/debian/patches/series 2011-06-15 21:48:09 UTC (rev 3453)
@@ -1,5 +1,3 @@
-#000_coda.diff
-#000_t_delta_warning.diff
001_misc.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
@@ -8,10 +6,8 @@
009_disable_duped_modules.diff
013_ip_packed.diff
020_linker.diff
-#021_superpages_i386.diff
103_stat_pipe.diff
#105_apm_amd64.diff
-#106_teken_op.diff
#107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
@@ -25,12 +21,10 @@
907_cpu_class.diff
908_linprocfs_is_not_proc.diff
910_GENERIC_hints.diff
-#912_binutils.diff
913_uudecode.diff
914_psm.diff
915_ip6.v6only.diff
916_NKPT_amd64.diff
-#917_track_alignment.diff
950_no_stack_protector.diff
951_disable_mk_magic.diff
999_config.diff
More information about the Glibc-bsd-commits
mailing list