diff --git a/[refs] b/[refs] index 421c93063363..a0e52294b96a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddacd0bc70fe724eba2b5967dd5b68e10d41486c +refs/heads/master: d96478d5a2dcfa3aba1ca4d71b07fef62b27d9c8 diff --git a/trunk/arch/sparc/kernel/ftrace.c b/trunk/arch/sparc/kernel/ftrace.c index 9103a56b39e8..2ea6e4ff7fd2 100644 --- a/trunk/arch/sparc/kernel/ftrace.c +++ b/trunk/arch/sparc/kernel/ftrace.c @@ -13,7 +13,7 @@ static const u32 ftrace_nop = 0x01000000; static u32 ftrace_call_replace(unsigned long ip, unsigned long addr) { - static u32 call; + u32 call; s32 off; off = ((s32)addr - (s32)ip);