summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMarkus Lidel <Markus.Lidel@shadowconnect.com>2005-06-23 22:02:11 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 00:05:28 -0700
commit61fbfa8129c1771061a0e9f47747854293081c5b (patch)
tree03fe14c41e2a49d3841ae6820a2dd43a91fddee9 /include/linux
parent34d6e07570ef74b965131452a862b13dfa779188 (diff)
downloadop-kernel-dev-61fbfa8129c1771061a0e9f47747854293081c5b.zip
op-kernel-dev-61fbfa8129c1771061a0e9f47747854293081c5b.tar.gz
[PATCH] I2O: bugfixes and compability enhancements
Changes: - Fixed sysfs bug where user and parent links where added to the I2O device itself - Fixed bug when calculating TID for the event handler and cleaned up the workflow of i2o_driver_dispatch() - Fixed oops when no I2O device could be found for an event delivered to Exec-OSM - Fixed initialization of spinlock in Exec-OSM - Fixed memory leak in i2o_cfg_passthru() and i2o_cfg_passthru() - Removed MTRR support - Added PCI ID of Promise SX6000 with firmware >= 1.20.x.x - Turn of caching for ioremapped memory of in_queue - Added initialization sequence for Promise controllers - Moved definition of u8 / u16 / u32 for raidutils before first use Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2o-dev.h16
-rw-r--r--include/linux/i2o.h5
2 files changed, 8 insertions, 13 deletions
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h
index ef7f644..3414325 100644
--- a/include/linux/i2o-dev.h
+++ b/include/linux/i2o-dev.h
@@ -24,6 +24,14 @@
#define MAX_I2O_CONTROLLERS 32
//#include <linux/ioctl.h>
+#ifndef __KERNEL__
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+#endif /* __KERNEL__ */
+
/*
* I2O Control IOCTLs and structures
@@ -126,14 +134,6 @@ struct i2o_evt_get {
#define I2O_BUS_CARDBUS 7
#define I2O_BUS_UNKNOWN 0x80
-#ifndef __KERNEL__
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-#endif /* __KERNEL__ */
-
typedef struct _i2o_pci_bus {
u8 PciFunctionNumber;
u8 PciDeviceNumber;
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index ea9a3ad..40e45a8 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -152,11 +152,6 @@ struct i2o_controller {
unsigned int raptor:1; /* split bar */
unsigned int promise:1; /* Promise controller */
-#ifdef CONFIG_MTRR
- int mtrr_reg0;
- int mtrr_reg1;
-#endif
-
struct list_head devices; /* list of I2O devices */
struct notifier_block *event_notifer; /* Events */
OpenPOWER on IntegriCloud