diff --git a/[refs] b/[refs] index f2353f3bbd4e..2f36018fb854 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d171e519da635a82ab759cbfd46617ac160c9ec0 +refs/heads/master: 8d08aed8d7714683b33666cc066e20f957dda01d diff --git a/trunk/include/asm-ia64/topology.h b/trunk/include/asm-ia64/topology.h index d8aae4da3978..412ef8e493a8 100644 --- a/trunk/include/asm-ia64/topology.h +++ b/trunk/include/asm-ia64/topology.h @@ -18,6 +18,10 @@ #include #ifdef CONFIG_NUMA + +/* Nodes w/o CPUs are preferred for memory allocations, see build_zonelists */ +#define PENALTY_FOR_NODE_WITH_CPUS 255 + /* * Returns the number of the node containing CPU 'cpu' */