aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-s390')
-rw-r--r--include/asm-s390/setup.h2
-rw-r--r--include/asm-s390/uaccess.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 00c03e46689b..f1959732b6fd 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -44,10 +44,12 @@ extern unsigned long machine_flags;
44#define MACHINE_HAS_IEEE (machine_flags & 2) 44#define MACHINE_HAS_IEEE (machine_flags & 2)
45#define MACHINE_HAS_CSP (machine_flags & 8) 45#define MACHINE_HAS_CSP (machine_flags & 8)
46#define MACHINE_HAS_DIAG44 (1) 46#define MACHINE_HAS_DIAG44 (1)
47#define MACHINE_HAS_MVCOS (0)
47#else /* __s390x__ */ 48#else /* __s390x__ */
48#define MACHINE_HAS_IEEE (1) 49#define MACHINE_HAS_IEEE (1)
49#define MACHINE_HAS_CSP (1) 50#define MACHINE_HAS_CSP (1)
50#define MACHINE_HAS_DIAG44 (machine_flags & 32) 51#define MACHINE_HAS_DIAG44 (machine_flags & 32)
52#define MACHINE_HAS_MVCOS (machine_flags & 512)
51#endif /* __s390x__ */ 53#endif /* __s390x__ */
52 54
53 55
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
index 39a2716ae188..e2047b0c9092 100644
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
@@ -100,6 +100,7 @@ struct uaccess_ops {
100 100
101extern struct uaccess_ops uaccess; 101extern struct uaccess_ops uaccess;
102extern struct uaccess_ops uaccess_std; 102extern struct uaccess_ops uaccess_std;
103extern struct uaccess_ops uaccess_mvcos;
103 104
104static inline int __put_user_fn(size_t size, void __user *ptr, void *x) 105static inline int __put_user_fn(size_t size, void __user *ptr, void *x)
105{ 106{