The patch titled
cciss: dirty hack
has been added to the -mm tree. Its filename is
cciss-dirty-hack.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cciss: dirty hack
From: "Mike Miller (OS Dev)" <mikem@xxxxxxxxxxxxxxxxxxxxxxx>
Not for merging - just to avoid impacting other -mm testing.
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/cciss.c | 2 +-
drivers/block/cciss.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/block/cciss.c~cciss-dirty-hack drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-dirty-hack
+++ a/drivers/block/cciss.c
@@ -3494,7 +3494,7 @@ static void cciss_shutdown(struct pci_de
} else {
printk(KERN_WARNING "Error flushing cache on controller %d\n", i);
}
- free_irq(hba[i]->intr[2], hba[i]);
+ free_irq(hba[i]->intr[SIMPLE_MODE_INT], hba[i]);
}
static void __devexit cciss_remove_one(struct pci_dev *pdev)
diff -puN drivers/block/cciss.h~cciss-dirty-hack drivers/block/cciss.h
--- a/drivers/block/cciss.h~cciss-dirty-hack
+++ a/drivers/block/cciss.h
@@ -70,8 +70,8 @@ struct ctlr_info
int highest_lun;
int usage_count; /* number of opens all all minor devices */
# define DOORBELL_INT 0
-# define PERF_MODE_INT 1
-# define SIMPLE_MODE_INT 2
+# define PERF_MODE_INT 2
+# define SIMPLE_MODE_INT 1
# define MEMQ_MODE_INT 3
unsigned int intr[4];
unsigned int msix_vector;
_
Patches currently in -mm which might be from mikem@xxxxxxxxxxxxxxxxxxxxxxx are
cciss-dirty-hack.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
