git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
kernel
/
compat_ptrace.h
diff --git
a/arch/s390/kernel/compat_ptrace.h
b/arch/s390/kernel/compat_ptrace.h
index a2be3a978d5c43281e3cf3115e2dfb19d473307f..123dd660d7fbed3793ed34a6dee6add2bc25c05a 100644
(file)
--- a/
arch/s390/kernel/compat_ptrace.h
+++ b/
arch/s390/kernel/compat_ptrace.h
@@
-1,10
+1,11
@@
#ifndef _PTRACE32_H
#define _PTRACE32_H
#ifndef _PTRACE32_H
#define _PTRACE32_H
+#include <asm/ptrace.h> /* needed for NUM_CR_WORDS */
#include "compat_linux.h" /* needed for psw_compat_t */
typedef struct {
#include "compat_linux.h" /* needed for psw_compat_t */
typedef struct {
- __u32 cr[
3
];
+ __u32 cr[
NUM_CR_WORDS
];
} per_cr_words32;
typedef struct {
} per_cr_words32;
typedef struct {