Pull bugfix into test branch

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v32 / kernel / signal.c

diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 0a3614dab88701b2827e26ce5858c94bf824852e..7cd6ac80340940300defd4f75ce48be1629461e9 100644 (file)
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -513,7 +513,7 @@ give_sigsegv:
 }
 
 /* Invoke a singal handler to, well, handle the signal. */
-extern inline void
+static inline void
 handle_signal(int canrestart, unsigned long sig,
              siginfo_t *info, struct k_sigaction *ka,
               sigset_t *oldset, struct pt_regs * regs)
@@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc,
 int __init
 cris_init_signal(void)
 {
-       u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL);
+       u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL);
 
        /* This is movu.w __NR_sigreturn, r9; break 13; */
        data[0] = 0x9c5f;