diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/cris/arch-v32/kernel/signal.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/cris/arch-v32/kernel/signal.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 99e59b3eacf8..7cd6ac803409 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc, | |||
| 686 | int __init | 686 | int __init |
| 687 | cris_init_signal(void) | 687 | cris_init_signal(void) |
| 688 | { | 688 | { |
| 689 | u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL); | 689 | u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL); |
| 690 | 690 | ||
| 691 | /* This is movu.w __NR_sigreturn, r9; break 13; */ | 691 | /* This is movu.w __NR_sigreturn, r9; break 13; */ |
| 692 | data[0] = 0x9c5f; | 692 | data[0] = 0x9c5f; |