git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
s390
/
net
/
iucv.h
diff --git
a/drivers/s390/net/iucv.h
b/drivers/s390/net/iucv.h
index
5c0b29a
..
1983302
100644
(file)
--- a/
drivers/s390/net/iucv.h
+++ b/
drivers/s390/net/iucv.h
@@
-63,7
+63,7
@@
debug_event(iucv_dbf_##name,level,(void*)(addr),len); \
} while (0)
debug_event(iucv_dbf_##name,level,(void*)(addr),len); \
} while (0)
-
extern DEFIN
E_PER_CPU(char[256], iucv_dbf_txt_buf);
+
DECLAR
E_PER_CPU(char[256], iucv_dbf_txt_buf);
#define IUCV_DBF_TEXT_(name,level,text...) \
do { \
#define IUCV_DBF_TEXT_(name,level,text...) \
do { \
@@
-231,7
+231,10
@@
typedef struct {
uchar iptype;
u32 ipmsgid;
u32 iptrgcls;
uchar iptype;
u32 ipmsgid;
u32 iptrgcls;
- uchar iprmmsg1[4];
+ union u2 {
+ u32 iprmmsg1_u32;
+ uchar iprmmsg1[4];
+ } ln1msg1;
union u1 {
u32 ipbfln1f;
uchar iprmmsg2[4];
union u1 {
u32 ipbfln1f;
uchar iprmmsg2[4];