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 commit 'origin/master' into next
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
system.h
diff --git
a/arch/s390/include/asm/system.h
b/arch/s390/include/asm/system.h
index
3a8b26e
..
4fb83c1
100644
(file)
--- a/
arch/s390/include/asm/system.h
+++ b/
arch/s390/include/asm/system.h
@@
-1,11
+1,7
@@
/*
/*
- *
include/asm-s390/system.h
+ *
Copyright IBM Corp. 1999, 2009
*
*
- * S390 version
- * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *
- * Derived from "include/asm-i386/system.h"
+ * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
*/
#ifndef __ASM_SYSTEM_H
*/
#ifndef __ASM_SYSTEM_H
@@
-469,6
+465,20
@@
extern psw_t sysc_restore_trace_psw;
extern psw_t io_restore_trace_psw;
#endif
extern psw_t io_restore_trace_psw;
#endif
+static inline int tprot(unsigned long addr)
+{
+ int rc = -EFAULT;
+
+ asm volatile(
+ " tprot 0(%1),0\n"
+ "0: ipm %0\n"
+ " srl %0,28\n"
+ "1:\n"
+ EX_TABLE(0b,1b)
+ : "+d" (rc) : "a" (addr) : "cc");
+ return rc;
+}
+
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */
#endif