Merge branch 'upstream-fixes'

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/file.c b/fs/file.c
index fd066b261c75..cea7cbea11d0 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -379,7 +379,6 @@ static void __devinit fdtable_defer_list_init(int cpu)
 void __init files_defer_init(void)
 {
         int i;
-        /* Really early - can't use for_each_cpu */
-        for (i = 0; i < NR_CPUS; i++)
+        for_each_cpu(i)
                 fdtable_defer_list_init(i);
 }