[Glibc-bsd-commits] r3675 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-08-07 22:28:47 +0000 (Sun, 07 Aug 2011)
New Revision: 3675

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/006_mips_i8259_alloc.diff
Log:
New upstream snapshot.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-08-07 18:12:14 UTC (rev 3674)
+++ trunk/kfreebsd-9/debian/changelog	2011-08-07 22:28:47 UTC (rev 3675)
@@ -1,8 +1,9 @@
-kfreebsd-9 (9.0~svn224609-2) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn224698-1) experimental; urgency=low
 
+  * New upstream snapshot.
   * 002_maxpathlen.diff: Fix another FTBFS on hurd-i386.
 
- -- Robert Millan <rmh at debian.org>  Wed, 03 Aug 2011 14:06:48 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 07 Aug 2011 20:18:19 +0000
 
 kfreebsd-9 (9.0~svn224609-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/patches/006_mips_i8259_alloc.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/006_mips_i8259_alloc.diff	2011-08-07 18:12:14 UTC (rev 3674)
+++ trunk/kfreebsd-9/debian/patches/006_mips_i8259_alloc.diff	2011-08-07 22:28:47 UTC (rev 3675)
@@ -1,20 +1,26 @@
 --- a/sys/mips/malta/gt_pci.c
 +++ b/sys/mips/malta/gt_pci.c
-@@ -367,6 +367,17 @@
- 	bus_space_write_1(sc->sc_st, sc->sc_ioh_elcr, 1,
- 	    (sc->sc_elcr >> 8) & 0xff);
+@@ -401,7 +401,22 @@
+ 	}
  
+ 	/* Initialize memory and i/o rmans. */
+-	device_add_child(dev, "pci", busno);
 +	{
++		device_t child;
 +		int rid;
 +		void *res;
-+		res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, IO_ICU1, IO_ICU1 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
++
++		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(dev, "cannot allocate registers\n");
-+		res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, IO_ICU2, IO_ICU2 + IO_ICUSIZE, IO_ICUSIZE, RF_ACTIVE);
++			device_printf(child, "cannot allocate registers\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(dev, "cannot allocate registers\n");
++			device_printf(child, "cannot allocate registers\n");
 +	}
 +
- 	/*
- 	 * Some ISA interrupts are reserved for devices that
- 	 * we know are hard-wired to certain IRQs.
+ 	return (bus_generic_attach(dev));
+ }
+