---
 numa.3 |    2 +-
 numa.h |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: numactl-dev/numa.3
===================================================================
--- numactl-dev.orig/numa.3
+++ numactl-dev/numa.3
@@ -953,7 +953,7 @@ to run with libnuma version 2.
 .br
 Source codes written for libnuma version 1 may be re-compiled without
 change with version 2 installed. To do so, in the code's Makefile add
-this option to CFLAGS:  -DVERSION1_COMPATIBILITY
+this option to CFLAGS:  -DNUMA_VERSION1_COMPATIBILITY
 
 .SH THREAD SAFETY
 .I numa_set_bind_policy
Index: numactl-dev/numa.h
===================================================================
--- numactl-dev.orig/numa.h
+++ numactl-dev/numa.h
@@ -17,7 +17,10 @@
 #ifndef _NUMA_H
 #define _NUMA_H 1
 
-/* Simple NUMA poliy library */
+/* allow an application to test for the current programming interface: */
+#define LIBNUMA_API_VERSION 2
+
+/* Simple NUMA policy library */
 
 #include <stddef.h>
 #include <string.h>
@@ -208,9 +211,6 @@ static inline void numa_free_cpumask(str
 	numa_bitmask_free(b);
 }
 
-/* set up to represent the cpus available to the current task */
-struct bitmask *numa_all_cpus;
-
 /* Convert node to CPU mask. -1/errno on failure, otherwise 0. */
 int numa_node_to_cpus(int, struct bitmask *);
 
@@ -250,7 +250,7 @@ struct bitmask *numa_parse_cpustring(cha
 /*
  * The following functions are for source code compatibility
  * with releases prior to version 2.
- * Such codes should be compiled with VERSION1_COMPATIBILITY defined.
+ * Such codes should be compiled with NUMA_VERSION1_COMPATIBILITY defined.
  */
 
 static inline void numa_set_interleave_mask_compat(nodemask_t *nodemask)
@@ -387,9 +387,9 @@ static inline int numa_node_to_cpus_comp
 
 /*
  * To compile an application that uses libnuma version 1:
- *   add -DVERSION1_COMPATIBILITY to your Makefile's CFLAGS
+ *   add -DNUMA_VERSION1_COMPATIBILITY to your Makefile's CFLAGS
  */
-#ifdef VERSION1_COMPATIBILITY
+#ifdef NUMA_VERSION1_COMPATIBILITY
 #include <numacompat1.h>
 #endif
 
