Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / linux / nodemask.h

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index ccee962f3559b6e97e7e8243439091dc2b9e080d..905e18f4b4122cdb7de8678766e4dada26e0b807 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -349,6 +349,7 @@ enum node_states {
 #else
        N_HIGH_MEMORY = N_NORMAL_MEMORY,
 #endif
+       N_CPU,          /* The node has one or more cpus */
        NR_NODE_STATES
 };