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 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
sysinfo.h
diff --git
a/arch/s390/include/asm/sysinfo.h
b/arch/s390/include/asm/sysinfo.h
index
ad93212
..
9d70057
100644
(file)
--- a/
arch/s390/include/asm/sysinfo.h
+++ b/
arch/s390/include/asm/sysinfo.h
@@
-100,6
+100,7
@@
struct sysinfo_3_2_2 {
char reserved_1[24];
} vm[8];
+ char reserved_544[3552];
};
static inline int stsi(void *sysinfo, int fc, int sel1, int sel2)