[Glibc-bsd-commits] r5038 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-11/debian kfreebsd-11/debian/patches
Robert Millan
rmh at alioth.debian.org
Fri Oct 11 23:38:18 UTC 2013
Author: rmh
Date: 2013-10-11 23:38:18 +0000 (Fri, 11 Oct 2013)
New Revision: 5038
Removed:
trunk/kfreebsd-10/debian/patches/006_mips_i8259_alloc.diff
trunk/kfreebsd-11/debian/patches/006_mips_i8259_alloc.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/series
trunk/kfreebsd-11/debian/changelog
trunk/kfreebsd-11/debian/patches/series
Log:
Remove (disabled) patch 006_mips_i8259_alloc.diff. Problem has been fixed in upstream already.
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-10/debian/changelog 2013-10-11 23:38:18 UTC (rev 5038)
@@ -7,6 +7,8 @@
[ Robert Millan ]
* Only build with Clang on architectures where it is the default in
upstream.
+ * Remove (disabled) patch 006_mips_i8259_alloc.diff. Problem has been
+ fixed in upstream already.
-- Robert Millan <rmh at debian.org> Thu, 10 Oct 2013 19:59:49 +0200
Deleted: trunk/kfreebsd-10/debian/patches/006_mips_i8259_alloc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/006_mips_i8259_alloc.diff 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-10/debian/patches/006_mips_i8259_alloc.diff 2013-10-11 23:38:18 UTC (rev 5038)
@@ -1,66 +0,0 @@
---- a/sys/mips/malta/gt_pci.c
-+++ b/sys/mips/malta/gt_pci.c
-@@ -59,6 +59,7 @@
- #include <machine/bus.h>
- #include <machine/cpu.h>
- #include <machine/pmap.h>
-+#include <machine/timerreg.h>
-
- #include <mips/malta/maltareg.h>
-
-@@ -401,7 +402,42 @@
- }
-
- /* Initialize memory and i/o rmans. */
-- device_add_child(dev, "pci", busno);
-+ {
-+ device_t child;
-+ int rid;
-+ void *res;
-+
-+ child = device_add_child(dev, "pci", busno);
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU1, IO_ICU1 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #1\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU2, IO_ICU2 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #2\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_TIMER1, IO_TIMER1 + IO_TIMERSIZE, IO_TIMERSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8254 controllers\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR, MALTA_SMSC_KYBD_ADR + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR + 4, MALTA_SMSC_KYBD_ADR + 4 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_RTCADR, MALTA_RTCADR + 2, 2, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for RTC controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, 0x81, 0x81 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for DMA controller\n");
-+ }
-+
- return (bus_generic_attach(dev));
- }
-
---- a/sys/mips/include/timerreg.h
-+++ b/sys/mips/include/timerreg.h
-@@ -49,6 +49,9 @@
- #define TIMER_CNTR2 (IO_TIMER1 + TIMER_REG_CNTR2)
- #define TIMER_MODE (IO_TIMER1 + TIMER_REG_MODE)
-
-+/* 3 timers, 4 registers each. */
-+#define IO_TIMERSIZE 3 * 4
-+
- #define timer_spkr_acquire() \
- acquire_timer2(TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT)
- #define timer_spkr_release() \
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-10/debian/patches/series 2013-10-11 23:38:18 UTC (rev 5038)
@@ -9,7 +9,6 @@
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-#006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
107_mount_update.diff
Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-11/debian/changelog 2013-10-11 23:38:18 UTC (rev 5038)
@@ -1,3 +1,10 @@
+kfreebsd-11 (11.0~svn256281-2) UNRELEASED; urgency=low
+
+ * Remove (disabled) patch 006_mips_i8259_alloc.diff. Problem has been
+ fixed in upstream already.
+
+ -- Robert Millan <rmh at debian.org> Sat, 12 Oct 2013 01:36:08 +0200
+
kfreebsd-11 (11.0~svn256281-1) experimental; urgency=low
* New upstream snapshot.
Deleted: trunk/kfreebsd-11/debian/patches/006_mips_i8259_alloc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/006_mips_i8259_alloc.diff 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-11/debian/patches/006_mips_i8259_alloc.diff 2013-10-11 23:38:18 UTC (rev 5038)
@@ -1,66 +0,0 @@
---- a/sys/mips/malta/gt_pci.c
-+++ b/sys/mips/malta/gt_pci.c
-@@ -59,6 +59,7 @@
- #include <machine/bus.h>
- #include <machine/cpu.h>
- #include <machine/pmap.h>
-+#include <machine/timerreg.h>
-
- #include <mips/malta/maltareg.h>
-
-@@ -401,7 +402,42 @@
- }
-
- /* Initialize memory and i/o rmans. */
-- device_add_child(dev, "pci", busno);
-+ {
-+ device_t child;
-+ int rid;
-+ void *res;
-+
-+ child = device_add_child(dev, "pci", busno);
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU1, IO_ICU1 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #1\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_ICU2, IO_ICU2 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8259 controller #2\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, IO_TIMER1, IO_TIMER1 + IO_TIMERSIZE, IO_TIMERSIZE, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for i8254 controllers\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR, MALTA_SMSC_KYBD_ADR + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_SMSC_KYBD_ADR + 4, MALTA_SMSC_KYBD_ADR + 4 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for keyboard controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, MALTA_RTCADR, MALTA_RTCADR + 2, 2, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for RTC controller\n");
-+
-+ res = bus_alloc_resource(child, SYS_RES_IOPORT, &rid, 0x81, 0x81 + 1, 1, RF_ACTIVE);
-+ if (res == NULL)
-+ device_printf(child, "cannot allocate registers for DMA controller\n");
-+ }
-+
- return (bus_generic_attach(dev));
- }
-
---- a/sys/mips/include/timerreg.h
-+++ b/sys/mips/include/timerreg.h
-@@ -49,6 +49,9 @@
- #define TIMER_CNTR2 (IO_TIMER1 + TIMER_REG_CNTR2)
- #define TIMER_MODE (IO_TIMER1 + TIMER_REG_MODE)
-
-+/* 3 timers, 4 registers each. */
-+#define IO_TIMERSIZE 3 * 4
-+
- #define timer_spkr_acquire() \
- acquire_timer2(TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT)
- #define timer_spkr_release() \
Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series 2013-10-10 19:28:13 UTC (rev 5037)
+++ trunk/kfreebsd-11/debian/patches/series 2013-10-11 23:38:18 UTC (rev 5038)
@@ -9,7 +9,6 @@
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
-#006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
107_mount_update.diff
More information about the Glibc-bsd-commits
mailing list