diff --git a/[refs] b/[refs] index 8eff2b97a469..ea7bc38b478b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c7d1bcad218808a4f67a4492a5e1d920e85c239 +refs/heads/master: e8fc96ed3603924e7aa09fd5e4dbd289b7e69907 diff --git a/trunk/init/dyn_array.c b/trunk/init/dyn_array.c index c4cd902a1180..1dc08140f3cb 100644 --- a/trunk/init/dyn_array.c +++ b/trunk/init/dyn_array.c @@ -91,6 +91,7 @@ unsigned long __init per_cpu_dyn_array_size(unsigned long *align) return total_size; } +#ifdef CONFIG_SMP void __init per_cpu_alloc_dyn_array(int cpu, char *ptr) { #ifdef CONFIG_HAVE_DYN_ARRAY @@ -122,3 +123,4 @@ void __init per_cpu_alloc_dyn_array(int cpu, char *ptr) } #endif } +#endif