diff --git a/[refs] b/[refs]
index d90b902333b9..e22b9bb3306f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 308a878210cde6ab19df9f392c24db53ad6f56bf
+refs/heads/master: 0d9adec525b87d8ab7e64efeabffb5b3f293056e
diff --git a/trunk/include/asm-ia64/acpi.h b/trunk/include/asm-ia64/acpi.h
index d734585a23cf..09a5dd0e44a8 100644
--- a/trunk/include/asm-ia64/acpi.h
+++ b/trunk/include/asm-ia64/acpi.h
@@ -110,9 +110,8 @@ extern void prefill_possible_map(void);
 extern int additional_cpus;
 
 #ifdef CONFIG_ACPI_NUMA
-/* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
-#ifdef CONFIG_IA64_NR_NODES
-#define MAX_PXM_DOMAINS CONFIG_IA64_NR_NODES
+#if MAX_NUMNODES > 256
+#define MAX_PXM_DOMAINS MAX_NUMNODES
 #else
 #define MAX_PXM_DOMAINS (256)
 #endif