git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
qib
/
qib.h
diff --git
a/drivers/infiniband/hw/qib/qib.h
b/drivers/infiniband/hw/qib/qib.h
index
769a1d9
..
c9624ea
100644
(file)
--- a/
drivers/infiniband/hw/qib/qib.h
+++ b/
drivers/infiniband/hw/qib/qib.h
@@
-1012,6
+1012,8
@@
struct qib_devdata {
u8 psxmitwait_supported;
/* cycle length of PS* counters in HW (in picoseconds) */
u16 psxmitwait_check_rate;
u8 psxmitwait_supported;
/* cycle length of PS* counters in HW (in picoseconds) */
u16 psxmitwait_check_rate;
+ /* high volume overflow errors defered to tasklet */
+ struct tasklet_struct error_tasklet;
};
/* hol_state values */
};
/* hol_state values */
@@
-1433,6
+1435,7
@@
extern struct mutex qib_mutex;
struct qib_hwerror_msgs {
u64 mask;
const char *msg;
struct qib_hwerror_msgs {
u64 mask;
const char *msg;
+ size_t sz;
};
#define QLOGIC_IB_HWE_MSG(a, b) { .mask = a, .msg = b }
};
#define QLOGIC_IB_HWE_MSG(a, b) { .mask = a, .msg = b }