diff --git a/[refs] b/[refs] index 0ebf47f6c601..47c8572088dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e03508b43fd93410c1abda2eeabe021de8461f95 +refs/heads/master: 4b0ff1a94cba36a35734c84f377e49cacc77f293 diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c index 01f2a8d254c2..7819022a8db5 100644 --- a/trunk/arch/x86_64/kernel/traps.c +++ b/trunk/arch/x86_64/kernel/traps.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -115,7 +116,6 @@ static int call_trace = 1; #endif #ifdef CONFIG_KALLSYMS -# include void printk_address(unsigned long address) { unsigned long offset = 0, symsize;