[kernel] r8317 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[maximilian attems]

Author: maks-guest
Date: Wed Feb 21 10:36:39 2007
New Revision: 8317

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/ide_generic_all-boot-option.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/11
Log:
Allow ide/pci/generic to claim chipsets as a a module or when built-in.
add patch by henj at hp.com


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Feb 21 10:36:39 2007
@@ -26,6 +26,7 @@
     - IB/mad: Fix race between cancel and receive completion
   * Add 2.6.18.7, thanks gregkh:
     - Fix a free-wrong-pointer bug in nfs/acl server (CVE-2007-0772)
+  * Allow ide_generic_all to be used modular and built in.
 
   [ Steve Langasek ]
   * debian/patches/bugfix/hp-laptop-acpi-blacklist.patch: ACPI-blacklist
@@ -34,7 +35,7 @@
     to prevent problems with memory leaks and heat stress at the expense
     of battery control and S3 suspend support.  Closes: #400488, #404143.
 
- -- Steve Langasek <vorlon at debian.org>  Tue, 20 Feb 2007 15:26:59 -0800
+ -- maximilian attems <maks at sternwelten.at>  Wed, 21 Feb 2007 10:34:37 +0100
 
 linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/ide_generic_all-boot-option.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ide_generic_all-boot-option.patch	Wed Feb 21 10:36:39 2007
@@ -0,0 +1,37 @@
+commit a4bea10eca68152e84ffc4eaeb9d20ec2ac34664
+Author: Patrick Jefferson <henj at hp.com>
+Date:   Tue Oct 3 01:14:34 2006 -0700
+
+    [PATCH] Allow ide_generic_all to be used modular and built in
+    
+    Allow ide/pci/generic to claim chipsets as a a module or when built-in.  It
+    requires using "all_generic_ide" as a boot option.
+    
+    Signed-off-by: Patrick Jefferson <henj at hp.com>
+    Acked-by: Alan Cox <alan at redhat.com>
+    Closes-Bug: 7017
+    Signed-off-by: Andrew Morton <akpm at osdl.org>
+    Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+index 78810ba..0cb7b9b 100644
+--- a/drivers/ide/pci/generic.c
++++ b/drivers/ide/pci/generic.c
+@@ -41,15 +41,8 @@
+ 
+ static int ide_generic_all;		/* Set to claim all devices */
+ 
+-#ifndef MODULE
+-static int __init ide_generic_all_on(char *unused)
+-{
+-	ide_generic_all = 1;
+-	printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
+-	return 1;
+-}
+-__setup("all-generic-ide", ide_generic_all_on);
+-#endif
++module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
++MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
+ 
+ static void __devinit init_hwif_generic (ide_hwif_t *hwif)
+ {

Modified: dists/sid/linux-2.6/debian/patches/series/11
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/11	(original)
+++ dists/sid/linux-2.6/debian/patches/series/11	Wed Feb 21 10:36:39 2007
@@ -7,3 +7,4 @@
 + bugfix/sparc/sbus-envctrl-remove-execve.patch
 + bugfix/nfs-acl-free-wrong-pointer.patch
 + bugfix/hp-laptop-acpi-blacklist.patch
++ bugfix/ide_generic_all-boot-option.patch