Author: maks
Date: Tue Dec 18 23:50:09 2007
New Revision: 9975
Log:
add stable release 2.6.23.12
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.12
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/2
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Tue Dec 18 23:50:09 2007
@@ -81,7 +81,9 @@
- BRIDGE: Section fix.
- Revert "Freezer: Fix APM emulation breakage"
* Backport fix for CVE-2007-5938
- - iwlwifi: fix possible NULL dereference in iwl_set_rate()
+ - iwlwifi: fix possible NULL dereference in iwl_set_rate()
+ * Add stable release 2.6.23.12:
+ - Revert "PNP: increase the maximum number of resources"
[ Martin Michlmayr ]
* [arm/iop32x] Re-enable USB_NET and PPP, thanks Daniel Hess (closes:
@@ -93,7 +95,7 @@
platform.
* Add em28xx-dv100.patch to add support for Pinnacle Dazzle DVC 100.
- -- maximilian attems <[EMAIL PROTECTED]> Mon, 17 Dec 2007 21:34:33 +0100
+ -- maximilian attems <[EMAIL PROTECTED]> Wed, 19 Dec 2007 00:48:46 +0100
linux-2.6 (2.6.23-1) unstable; urgency=low
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.12
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/2.6.23.12 Tue Dec 18
23:50:09 2007
@@ -0,0 +1,63 @@
+diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
+index 5abf5ea..0e3b8d0 100644
+--- a/drivers/pnp/pnpacpi/rsparser.c
++++ b/drivers/pnp/pnpacpi/rsparser.c
+@@ -82,11 +82,9 @@ static void pnpacpi_parse_allocated_irqresource(struct
pnp_resource_table *res,
+ while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
+ i < PNP_MAX_IRQ)
+ i++;
+- if (i >= PNP_MAX_IRQ) {
+- printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+- "resources: %d \n", PNP_MAX_IRQ);
++ if (i >= PNP_MAX_IRQ)
+ return;
+- }
++
+ res->irq_resource[i].flags = IORESOURCE_IRQ; // Also clears _UNSET
flag
+ res->irq_resource[i].flags |= irq_flags(triggering, polarity);
+ irq = acpi_register_gsi(gsi, triggering, polarity);
+@@ -165,9 +163,6 @@ static void pnpacpi_parse_allocated_dmaresource(struct
pnp_resource_table *res,
+ }
+ res->dma_resource[i].start = dma;
+ res->dma_resource[i].end = dma;
+- } else {
+- printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+- "resources: %d \n", PNP_MAX_DMA);
+ }
+ }
+
+@@ -189,9 +184,6 @@ static void pnpacpi_parse_allocated_ioresource(struct
pnp_resource_table *res,
+ }
+ res->port_resource[i].start = io;
+ res->port_resource[i].end = io + len - 1;
+- } else {
+- printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+- "resources: %d \n", PNP_MAX_PORT);
+ }
+ }
+
+@@ -215,9 +207,6 @@ static void pnpacpi_parse_allocated_memresource(struct
pnp_resource_table *res,
+
+ res->mem_resource[i].start = mem;
+ res->mem_resource[i].end = mem + len - 1;
+- } else {
+- printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+- "resources: %d\n", PNP_MAX_MEM);
+ }
+ }
+
+diff --git a/include/linux/pnp.h b/include/linux/pnp.h
+index 62decab..16b46aa 100644
+--- a/include/linux/pnp.h
++++ b/include/linux/pnp.h
+@@ -13,8 +13,8 @@
+ #include <linux/errno.h>
+ #include <linux/mod_devicetable.h>
+
+-#define PNP_MAX_PORT 24
+-#define PNP_MAX_MEM 12
++#define PNP_MAX_PORT 8
++#define PNP_MAX_MEM 4
+ #define PNP_MAX_IRQ 2
+ #define PNP_MAX_DMA 2
+ #define PNP_NAME_LEN 50
Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2 (original)
+++ dists/sid/linux-2.6/debian/patches/series/2 Tue Dec 18 23:50:09 2007
@@ -5,3 +5,4 @@
+ bugfix/all/2.6.23.11
+ bugfix/all/iwlwifi-null-deref.patch
+ features/all/em28xx-dv100.patch
++ bugfix/all/2.6.23.12
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
