Merge commit 'v2.6.39-rc7' into sched/core

This commit is contained in:
Ingo Molnar 2011-05-12 09:36:18 +02:00
commit 9cb5baba5e
560 changed files with 6272 additions and 3254 deletions

View file

@ -266,8 +266,10 @@ static void __init setup_bootmem(void)
}
memset(pfnnid_map, 0xff, sizeof(pfnnid_map));
for (i = 0; i < npmem_ranges; i++)
for (i = 0; i < npmem_ranges; i++) {
node_set_state(i, N_NORMAL_MEMORY);
node_set_online(i);
}
#endif
/*