diff --git a/src/vppinfra/os.h b/src/vppinfra/os.h
index 50a4ad9..cd3b428 100644
--- a/src/vppinfra/os.h
+++ b/src/vppinfra/os.h
@@ -57,6 +57,7 @@
 f64 os_cpu_clock_frequency (void);
 
 extern __thread uword __os_thread_index;
+extern __thread uword __os_numa_index;
 
 static_always_inline uword
 os_get_thread_index (void)
@@ -71,6 +72,18 @@
 }
 
 static_always_inline uword
+os_get_numa_index (void)
+{
+  return __os_numa_index;
+}
+
+static_always_inline void
+os_set_numa_index (uword numa_index)
+{
+  __os_numa_index = numa_index;
+}
+
+static_always_inline uword
 os_get_cpu_number (void) __attribute__ ((deprecated));
 
 static_always_inline uword