Skip to contentSkip to conversation

Fix ahci detection in kernel 2.6.35

PATCH In review Andrey Borzenkov 2 participants 2 messages Aug 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix ahci detection in kernel 2.6.35

Kernel 2.6.35 (may be, earlier) split ahci into libahci.ko and ahci.ko and added ahci_platform.ko. As a result, drivers ahci and ahci_platform do not contain any symbol that are checked for storage modules (it is libahci.ko that references ata_scsi_ioctl now). So add additional symbol ahci_init_controller; it seems this is expected to be called by every driver based on libahci.ko.

---

 modules.d/90kernel-modules/installkernel |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
modules.d/90kernel-modules/installkernel +1 -1
index 2171e5a..e679b10 100755
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [[ -z $drivers ]]; then
     block_module_test() {
-	local blockfuncs='ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
+	local blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
 
 	egrep -q "$blockfuncs" "$1"
     }
#1 lore raw

Thanks! And pushed.

Quoted 32 lines · Andrey Borzenkov

Kernel 2.6.35 (may be, earlier) split ahci into libahci.ko and ahci.ko and added ahci_platform.ko. As a result, drivers ahci and ahci_platform do not contain any symbol that are checked for storage modules (it is libahci.ko that references ata_scsi_ioctl now). So add additional symbol ahci_init_controller; it seems this is expected to be called by every driver based on libahci.ko.

---

  modules.d/90kernel-modules/installkernel |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
modules.d/90kernel-modules/installkernel +1 -2
index 2171e5a..e679b10 100755
@@ -1,7 +1,7 @@
  #!/bin/bash
  if [[ -z $drivers ]]; then
      block_module_test() {
-	local blockfuncs='ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
+	local blockfuncs='ahci_init_controller|ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device'
 
  	egrep -q "$blockfuncs" "$1"
      }
 
--

To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html