projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[cascardo/linux.git]
/
arch
/
s390
/
include
/
asm
/
unistd.h
diff --git
a/arch/s390/include/asm/unistd.h
b/arch/s390/include/asm/unistd.h
index
02613ba
..
3066031
100644
(file)
--- a/
arch/s390/include/asm/unistd.h
+++ b/
arch/s390/include/asm/unistd.h
@@
-9,6
+9,9
@@
#include <uapi/asm/unistd.h>
#define __IGNORE_time
+#define __IGNORE_pkey_mprotect
+#define __IGNORE_pkey_alloc
+#define __IGNORE_pkey_free
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_SYS_ALARM