[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B9B0868.7080807@kernel.org>
Date: Fri, 12 Mar 2010 19:37:12 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: "Eric W. Biederman" <ebiederm@...ssion.com>,
James Bottomley <James.Bottomley@...senPartnership.com>
CC: Alexander Beregalov <a.beregalov@...il.com>,
Greg KH <gregkh@...e.de>, linux-acpi@...r.kernel.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: 2.6.34-rc1: ACPI: BUG: key f71f0168 not in .data!
---
drivers/base/attribute_container.c | 1 +
drivers/scsi/lpfc/lpfc_attr.c | 3 +++
drivers/scsi/scsi_sysfs.c | 15 ++++++++++++---
3 files changed, 16 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/scsi/lpfc/lpfc_attr.c
===================================================================
--- linux-2.6.orig/drivers/scsi/lpfc/lpfc_attr.c
+++ linux-2.6/drivers/scsi/lpfc/lpfc_attr.c
@@ -3780,6 +3780,7 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport
struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
int error;
+ sysfs_bin_attr_init(&sysfs_drvr_stat_data_attr);
error = sysfs_create_bin_file(&shost->shost_dev.kobj,
&sysfs_drvr_stat_data_attr);
@@ -3787,11 +3788,13 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport
if (error || vport->port_type == LPFC_NPIV_PORT)
goto out;
+ sysfs_bin_attr_init(&sysfs_ctlreg_attr);
error = sysfs_create_bin_file(&shost->shost_dev.kobj,
&sysfs_ctlreg_attr);
if (error)
goto out_remove_stat_attr;
+ sysfs_bin_attr_init(&sysfs_mbox_attr);
error = sysfs_create_bin_file(&shost->shost_dev.kobj,
&sysfs_mbox_attr);
if (error)
Index: linux-2.6/drivers/scsi/scsi_sysfs.c
===================================================================
--- linux-2.6.orig/drivers/scsi/scsi_sysfs.c
+++ linux-2.6/drivers/scsi/scsi_sysfs.c
@@ -907,20 +907,27 @@ int scsi_sysfs_add_sdev(struct scsi_devi
/* create queue files, which may be writable, depending on the host */
if (sdev->host->hostt->change_queue_depth) {
+ sysfs_bin_attr_init(&sdev_attr_queue_depth_rw);
error = device_create_file(&sdev->sdev_gendev,
&sdev_attr_queue_depth_rw);
+ sysfs_bin_attr_init(&sdev_attr_queue_ramp_up_period);
error = device_create_file(&sdev->sdev_gendev,
&sdev_attr_queue_ramp_up_period);
}
- else
+ else {
+ sysfs_bin_attr_init(&dev_attr_queue_depth);
error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth);
+ }
if (error)
return error;
- if (sdev->host->hostt->change_queue_type)
+ if (sdev->host->hostt->change_queue_type) {
+ sysfs_bin_attr_init(&sdev_attr_queue_type_rw);
error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_type_rw);
- else
+ } else {
+ sysfs_bin_attr_init(&dev_attr_queue_type);
error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_type);
+ }
if (error)
return error;
@@ -935,6 +942,7 @@ int scsi_sysfs_add_sdev(struct scsi_devi
/* add additional host specific attributes */
if (sdev->host->hostt->sdev_attrs) {
for (i = 0; sdev->host->hostt->sdev_attrs[i]; i++) {
+ sysfs_bin_attr_init(sdev->host->hostt->sdev_attrs[i]);
error = device_create_file(&sdev->sdev_gendev,
sdev->host->hostt->sdev_attrs[i]);
if (error)
@@ -1060,6 +1068,7 @@ int scsi_sysfs_add_host(struct Scsi_Host
/* add host specific attributes */
if (shost->hostt->shost_attrs) {
for (i = 0; shost->hostt->shost_attrs[i]; i++) {
+ sysfs_bin_attr_init(shost->hostt->shost_attrs[i]);
error = device_create_file(&shost->shost_dev,
shost->hostt->shost_attrs[i]);
if (error)
Index: linux-2.6/drivers/base/attribute_container.c
===================================================================
--- linux-2.6.orig/drivers/base/attribute_container.c
+++ linux-2.6/drivers/base/attribute_container.c
@@ -328,6 +328,7 @@ attribute_container_add_attrs(struct dev
return sysfs_create_group(&classdev->kobj, cont->grp);
for (i = 0; attrs[i]; i++) {
+ sysfs_bin_attr_init(attrs[i]);
error = device_create_file(classdev, attrs[i]);
if (error)
return error;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists