1 files changed, 13 insertions, 6 deletions

diff --git a/kernel/profile.c b/kernel/profile.c
index 68afe121e507..fb660c7d35ba 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -13,7 +13,6 @@
  *      to resolve timer interrupt livelocks, William Irwin, Oracle, 2004
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/profile.h>
 #include <linux/bootmem.h>
@@ -299,7 +298,7 @@ out:
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int profile_cpu_callback(struct notifier_block *info,
+static int __devinit profile_cpu_callback(struct notifier_block *info,
                                         unsigned long action, void *__cpu)
 {
         int node, cpu = (unsigned long)__cpu;
@@ -310,13 +309,17 @@ static int profile_cpu_callback(struct notifier_block *info,
                 node = cpu_to_node(cpu);
                 per_cpu(cpu_profile_flip, cpu) = 0;
                 if (!per_cpu(cpu_profile_hits, cpu)[1]) {
-                        page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0);
+                        page = alloc_pages_node(node,
+                                        GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                        0);
                         if (!page)
                                 return NOTIFY_BAD;
                         per_cpu(cpu_profile_hits, cpu)[1] = page_address(page);
                 }
                 if (!per_cpu(cpu_profile_hits, cpu)[0]) {
-                        page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0);
+                        page = alloc_pages_node(node,
+                                        GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                        0);
                         if (!page)
                                 goto out_free;
                         per_cpu(cpu_profile_hits, cpu)[0] = page_address(page);
@@ -492,12 +495,16 @@ static int __init create_hash_tables(void)
                 int node = cpu_to_node(cpu);
                 struct page *page;
 
-                page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0);
+                page = alloc_pages_node(node,
+                                GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                0);
                 if (!page)
                         goto out_cleanup;
                 per_cpu(cpu_profile_hits, cpu)[1]
                                 = (struct profile_hit *)page_address(page);
-                page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0);
+                page = alloc_pages_node(node,
+                                GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                0);
                 if (!page)
                         goto out_cleanup;
                 per_cpu(cpu_profile_hits, cpu)[0]