diff --git a/[refs] b/[refs] index 18d053a2e864..14dcd948d675 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47492d3667ec519172ab978bd8231b8c7152fa9d +refs/heads/master: e9b59d834faf0305cb6214a358f65f72c57b9e99 diff --git a/trunk/arch/x86_64/kernel/smp.c b/trunk/arch/x86_64/kernel/smp.c index 9db9dda161b4..493a0d1f1279 100644 --- a/trunk/arch/x86_64/kernel/smp.c +++ b/trunk/arch/x86_64/kernel/smp.c @@ -28,8 +28,6 @@ #include #include -#define __cpuinit __init - /* * Smarter SMP flushing macros. * c/o Linus Torvalds.