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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
lowcore.h
diff --git
a/arch/s390/include/asm/lowcore.h
b/arch/s390/include/asm/lowcore.h
index
228cf0b
..
f26280d
100644
(file)
--- a/
arch/s390/include/asm/lowcore.h
+++ b/
arch/s390/include/asm/lowcore.h
@@
-268,7
+268,7
@@
struct _lowcore {
__u64 vdso_per_cpu_data; /* 0x0358 */
__u64 machine_flags; /* 0x0360 */
__u64 ftrace_func; /* 0x0368 */
- __u64
sie_hook;
/* 0x0370 */
+ __u64
gmap;
/* 0x0370 */
__u64 cmf_hpp; /* 0x0378 */
/* Interrupt response block. */