diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 17:45:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 17:45:56 -0400 |
| commit | 6288c338661cc26ea66e7818b0d3862ee163fd1d (patch) | |
| tree | 49fbca961371119f8c0d476063fa3c7c0ab7124b /arch | |
| parent | 8b66a454bf09958b474d12981996287d19aa462d (diff) | |
| parent | e675c0d2bf523a80098c843603ccc091d3720fb4 (diff) | |
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] zcrypt: Fix ap_poll_requests counter in lost requests error path.
[S390] zcrypt: Fix possible dead lock in AP bus module.
[S390] cio: Device status validity.
[S390] kprobes: Align probe address.
[S390] Fix TCP/UDP pseudo header checksum computation.
[S390] dasd: Work around gcc bug.
Diffstat (limited to 'arch')
| -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 8af549e95730..993f35381496 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
| @@ -167,7 +167,7 @@ static int __kprobes swap_instruction(void *aref) | |||
| 167 | * shall not cross any page boundaries (vmalloc area!) when writing | 167 | * shall not cross any page boundaries (vmalloc area!) when writing |
| 168 | * the new instruction. | 168 | * the new instruction. |
| 169 | */ | 169 | */ |
| 170 | addr = (u32 *)ALIGN((unsigned long)args->ptr, 4); | 170 | addr = (u32 *)((unsigned long)args->ptr & -4UL); |
| 171 | if ((unsigned long)args->ptr & 2) | 171 | if ((unsigned long)args->ptr & 2) |
| 172 | instr = ((*addr) & 0xffff0000) | args->new; | 172 | instr = ((*addr) & 0xffff0000) | args->new; |
| 173 | else | 173 | else |