packages (LINUX_2_6_27): kernel/kernel-mpt-fusion.patch - update from: htt...
glen
glen at pld-linux.org
Sun May 22 15:08:56 CEST 2011
Author: glen Date: Sun May 22 13:08:56 2011 GMT
Module: packages Tag: LINUX_2_6_27
---- Log message:
- update from:
http://download.opensuse.org/update/11.1/rpm/src/kernel-source-2.6.27.56-0.1.1.src.rpm
patches.drivers.tar.bz2
patches.drivers/mpt-fusion-4.00.43.00-update
---- Files affected:
packages/kernel:
kernel-mpt-fusion.patch (1.1 -> 1.1.4.1)
---- Diffs:
================================================================
Index: packages/kernel/kernel-mpt-fusion.patch
diff -u packages/kernel/kernel-mpt-fusion.patch:1.1 packages/kernel/kernel-mpt-fusion.patch:1.1.4.1
--- packages/kernel/kernel-mpt-fusion.patch:1.1 Thu Nov 27 17:10:33 2008
+++ packages/kernel/kernel-mpt-fusion.patch Sun May 22 15:08:51 2011
@@ -4148,7 +4148,7 @@
+ if (copy_to_user(uarg, pKarg, copy_buffer_sz)) {
+ printk(KERN_ERR "%s@%d::%s() - "
+ "Unable to write out csmi_sas_get_raid_config @ %p\n",
-+ __FILE__, __LINE__, __FUNCTION__, uarg);
++ __FILE__, __LINE__, __FUNCTION__, uarg);
+ free_pages((unsigned long)pKarg, memory_pages);
+ return -EFAULT;
+ }
@@ -5462,7 +5462,7 @@
+ cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
+ cfg.pageAddr = (bus << 8) + id
+ + (MPI_SAS_DEVICE_PGAD_FORM_BUS_TARGET_ID <<
-+ MPI_SAS_DEVICE_PGAD_FORM_SHIFT);
++ MPI_SAS_DEVICE_PGAD_FORM_SHIFT);
+
+ if ((rc = mpt_config(ioc, &cfg)) != 0) {
+ rc=-1;
@@ -10381,7 +10381,7 @@
- dexitprintk(ioc, printk(MYIOC_s_INFO_FMT "free @ %p, sz=%d bytes\n",
- ioc->name, ioc->alloc, ioc->alloc_sz));
+ dexitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "free @ %p, sz=%d bytes\n",
-+ ioc->name, ioc->alloc, ioc->alloc_sz));
++ ioc->name, ioc->alloc, ioc->alloc_sz));
pci_free_consistent(ioc->pcidev, sz,
ioc->alloc, ioc->alloc_dma);
ioc->reply_frames = NULL;
@@ -14942,7 +14942,7 @@
if (numfrags > maxfrags) {
ret = -EMLINK;
- goto fwdl_out;
-+ goto fwdl_out;
++ goto fwdl_out;
}
dctlprintk(iocp, printk(MYIOC_s_DEBUG_FMT "DbG: sgl buffer = %p, sgfrags = %d\n",
@@ -19195,9 +19195,9 @@
+ starget_printk(KERN_INFO, starget, MYIOC_s_FMT
+ "delete device: fw_channel %d, fw_id %d, phy %d, "
+ "sas_addr 0x%llx\n", ioc->name,
-+ p->phy_info[i].attached.channel,
++ p->phy_info[i].attached.channel,
+ p->phy_info[i].attached.id,
-+ p->phy_info[i].attached.phy_id, (unsigned long long)
++ p->phy_info[i].attached.phy_id, (unsigned long long)
+ p->phy_info[i].attached.sas_address);
+
+ mptsas_port_delete(ioc, p->phy_info[i].port_details);
@@ -20884,7 +20884,7 @@
+ if (!phy_info->port_details) {
+ dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
+ "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+ __FUNCTION__, fw_id, __LINE__));
++ __FUNCTION__, fw_id, __LINE__));
+ return;
}
-
@@ -20895,7 +20895,7 @@
+ if (!rphy) {
+ dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
+ "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+ __FUNCTION__, fw_id, __LINE__));
++ __FUNCTION__, fw_id, __LINE__));
+ return;
+ }
+ if (phy_info->attached.device_info &
@@ -20921,7 +20921,7 @@
+ if (!port) {
+ dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
+ "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+ __FUNCTION__, fw_id, __LINE__));
++ __FUNCTION__, fw_id, __LINE__));
+ return;
+ }
+ port_info = phy_info->portinfo;
@@ -21209,7 +21209,7 @@
+ (hot_plug_info->channel << 8) + hot_plug_info->id)) {
+ dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
+ "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+ __FUNCTION__, hot_plug_info->id, __LINE__));
++ __FUNCTION__, hot_plug_info->id, __LINE__));
+ break;
+ }
@@ -21225,7 +21225,7 @@
+ if (!phy_info){
+ dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
+ "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+ __FUNCTION__, hot_plug_info->id, __LINE__));
++ __FUNCTION__, hot_plug_info->id, __LINE__));
+ break;
+ }
@@ -22708,7 +22708,7 @@
+ depth);
+ else if (depth < 0)
+ sdev_printk(KERN_INFO, sdev,
-+ "Tagged Command Queueing is being "
++ "Tagged Command Queueing is being "
+ "disabled\n");
+ else if (depth == 0)
+ sdev_printk(KERN_INFO, sdev,
@@ -27716,7 +27716,7 @@
+ }
+
+ dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+ __FUNCTION__));
++ __FUNCTION__));
+ buffer_type = karg.data.BufferType;
+ if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
+ printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -27761,7 +27761,7 @@
+ " FAILED, (request_sz=%d)\n", ioc->name,
+ __FUNCTION__, request_data_sz);
+ mpt_free_msg_frame(ioc, mf);
-+ return -EAGAIN;
++ return -EAGAIN;
+ }
+ ioc->DiagBuffer[buffer_type] = request_data;
+ ioc->DiagBuffer_sz[buffer_type] = request_data_sz;
@@ -27769,7 +27769,7 @@
+ }
+
+ ioc->DiagBuffer_Status[buffer_type] = 0;
-+ diag_buffer_post_request = (DiagBufferPostRequest_t *)mf;
++ diag_buffer_post_request = (DiagBufferPostRequest_t *)mf;
+ diag_buffer_post_request->Function = MPI_FUNCTION_DIAG_BUFFER_POST;
+ diag_buffer_post_request->ChainOffset = 0;
+ diag_buffer_post_request->BufferType = karg.data.BufferType;
@@ -27811,7 +27811,7 @@
+ if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
+ rc = -ETIME;
+ printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+ __FUNCTION__);
++ __FUNCTION__);
+ if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
+ mpt_free_msg_frame(ioc, mf);
+ goto out;
@@ -27896,7 +27896,7 @@
+ }
+
+ dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+ __FUNCTION__));
++ __FUNCTION__));
+ buffer_type = karg.data.UniqueId & 0x000000ff;
+ if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
+ printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -27905,7 +27905,7 @@
+ }
+
+ if ((ioc->DiagBuffer_Status[buffer_type] &
-+ MPT_DIAG_BUFFER_IS_REGISTERED) == 0 ) {
++ MPT_DIAG_BUFFER_IS_REGISTERED) == 0 ) {
+ printk(MYIOC_s_DEBUG_FMT "%s: buffer_type=%x is not "
+ "registered\n", ioc->name, __FUNCTION__, buffer_type);
+ return -EFAULT;
@@ -27955,7 +27955,7 @@
+ if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
+ rc = -ETIME;
+ printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+ __FUNCTION__);
++ __FUNCTION__);
+ if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
+ mpt_free_msg_frame(ioc, mf);
+ goto out;
@@ -28111,7 +28111,7 @@
+ }
+
+ dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+ __FUNCTION__));
++ __FUNCTION__));
+ buffer_type = karg.data.BufferType;
+ if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
+ printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -28120,7 +28120,7 @@
+ }
+
+ if ((ioc->DiagBuffer_Status[buffer_type] &
-+ MPT_DIAG_BUFFER_IS_REGISTERED) == 0) {
++ MPT_DIAG_BUFFER_IS_REGISTERED) == 0) {
+ printk(MYIOC_s_DEBUG_FMT "%s: buffer_type=%x is not "
+ "registered\n", ioc->name, __FUNCTION__, buffer_type);
+ goto out;
@@ -28301,7 +28301,7 @@
+ if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
+ rc = -ETIME;
+ printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+ __FUNCTION__);
++ __FUNCTION__);
+ if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
+ mpt_free_msg_frame(ioc, mf);
+ goto out;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-mpt-fusion.patch?r1=1.1&r2=1.1.4.1&f=u
More information about the pld-cvs-commit
mailing list