diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:12:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:12:08 -0700 |
| commit | 53ce2dc2718c57346c543dab254fc900c6fe6c65 (patch) | |
| tree | 451fcbc89084b1d9b83c105294794f29bf6d59f3 /arch/s390/kernel/kprobes.c | |
| parent | 8b14cb9953c6b569327e9372718cff09a98f9589 (diff) | |
| parent | c51b9621796c31810fb66509ea1faee4597d9c03 (diff) | |
| download | kernel_samsung_tuna-53ce2dc2718c57346c543dab254fc900c6fe6c65.zip kernel_samsung_tuna-53ce2dc2718c57346c543dab254fc900c6fe6c65.tar.gz kernel_samsung_tuna-53ce2dc2718c57346c543dab254fc900c6fe6c65.tar.bz2 | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Change atomic_read/set to inline functions with barrier semantics.
[S390] kprobes: fix instruction length calculation
[S390] hypfs: inode corruption due to missing locking
[S390] disassembler: fix b2 opcodes like srst, bsg, and others
[S390] vmur: fix reference counting for vmur device structure
[S390] vmur: fix diag14 exceptions with addresses > 2GB.
[S390] qdio: Refresh buffer states for IQDIO Asynchronous output queue
[S390] qdio: fix EQBS handling on CCQ96
[S390] cio: change confusing message in cmf.
[S390] cio: dont forget to set last slot to NULL in ccw_uevent().
Diffstat (limited to 'arch/s390/kernel/kprobes.c')
| -rw-r--r-- | arch/s390/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 358d2bb..e40373d 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c @@ -85,7 +85,7 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn) ainsn->reg = (*ainsn->insn & 0xf0) >> 4; /* save the instruction length (pop 5-5) in bytes */ - switch (*(__u8 *) (ainsn->insn) >> 4) { + switch (*(__u8 *) (ainsn->insn) >> 6) { case 0: ainsn->ilen = 2; break; |