summaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel/traps.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-03 10:34:36 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-03 10:34:36 +0200
commitb5259d944279d0b7e78a83849a352d8ba0447c4c (patch)
tree42f0e7dc404bc776f9a736c17f52c121da166fc1 /arch/m32r/kernel/traps.c
parent1c50b728c3e734150b8a4a8310ce3e01bc5c70be (diff)
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff)
downloadblackbird-op-linux-b5259d944279d0b7e78a83849a352d8ba0447c4c.tar.gz
blackbird-op-linux-b5259d944279d0b7e78a83849a352d8ba0447c4c.zip
Merge commit 'v2.6.27-rc8' into core/rcu
Diffstat (limited to 'arch/m32r/kernel/traps.c')
-rw-r--r--arch/m32r/kernel/traps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 46159a4e644b..03b14e55cd89 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -61,7 +61,7 @@ extern unsigned long eit_vector[];
((unsigned long)func - (unsigned long)eit_vector - entry*4)/4 \
+ 0xff000000UL
-void set_eit_vector_entries(void)
+static void set_eit_vector_entries(void)
{
extern void default_eit_handler(void);
extern void system_call(void);
@@ -121,9 +121,9 @@ void __init trap_init(void)
cpu_init();
}
-int kstack_depth_to_print = 24;
+static int kstack_depth_to_print = 24;
-void show_trace(struct task_struct *task, unsigned long *stack)
+static void show_trace(struct task_struct *task, unsigned long *stack)
{
unsigned long addr;
@@ -224,7 +224,7 @@ bad:
printk("\n");
}
-DEFINE_SPINLOCK(die_lock);
+static DEFINE_SPINLOCK(die_lock);
void die(const char * str, struct pt_regs * regs, long err)
{
OpenPOWER on IntegriCloud