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 git://git.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
kprobes.c
diff --git
a/arch/s390/kernel/kprobes.c
b/arch/s390/kernel/kprobes.c
index
3d34eef
..
2a3d2bf
100644
(file)
--- a/
arch/s390/kernel/kprobes.c
+++ b/
arch/s390/kernel/kprobes.c
@@
-63,6
+63,8
@@
int __kprobes is_prohibited_opcode(kprobe_opcode_t *instruction)
case 0x0b: /* bsm */
case 0x83: /* diag */
case 0x44: /* ex */
case 0x0b: /* bsm */
case 0x83: /* diag */
case 0x44: /* ex */
+ case 0xac: /* stnsm */
+ case 0xad: /* stosm */
return -EINVAL;
}
switch (*(__u16 *) instruction) {
return -EINVAL;
}
switch (*(__u16 *) instruction) {
@@
-72,6
+74,7
@@
int __kprobes is_prohibited_opcode(kprobe_opcode_t *instruction)
case 0xb258: /* bsg */
case 0xb218: /* pc */
case 0xb228: /* pt */
case 0xb258: /* bsg */
case 0xb218: /* pc */
case 0xb228: /* pt */
+ case 0xb98d: /* epsw */
return -EINVAL;
}
return 0;
return -EINVAL;
}
return 0;