projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[linux-2.6-block.git]
/
arch
/
alpha
/
kernel
/
traps.c
diff --git
a/arch/alpha/kernel/traps.c
b/arch/alpha/kernel/traps.c
index c778779007fc58339abb11bc7f42f1299d5d65c1..cefc5a355ef9645233bfec5535e71e1d96e47e54 100644
(file)
--- a/
arch/alpha/kernel/traps.c
+++ b/
arch/alpha/kernel/traps.c
@@
-31,7
+31,7
@@
static int opDEC_fix;
-static void __init
+static void __
cpu
init
opDEC_check(void)
{
__asm__ __volatile__ (
@@
-1072,7
+1072,7
@@
give_sigbus:
return;
}
-void __init
+void __
cpu
init
trap_init(void)
{
/* Tell PAL-code what global pointer we want in the kernel. */