diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 17:01:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 17:01:37 -0700 |
| commit | 37e53db8aa233c65142d63b496277bf5be9c0ade (patch) | |
| tree | c4b7409825cc0497593e94dd7d6f874d22b0b3f0 /include/asm-ia64/acpi.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 (diff) | |
| parent | [IA64] update sn2 defconfig (diff) | |
| download | linux-dev-37e53db8aa233c65142d63b496277bf5be9c0ade.tar.xz linux-dev-37e53db8aa233c65142d63b496277bf5be9c0ade.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] update sn2 defconfig
[IA64] Add mca recovery failure messages
[IA64-SGI] fix SGI Altix tioce_reserve_m32() bug
[IA64] enable dumps to capture second page of kernel stack
[IA64-SGI] - Reduce overhead of reading sn_topology
[IA64-SGI] - Fix discover of nearest cpu node to IO node
[IA64] IOC4 config option ordering
[IA64] Setup an IA64 specific reclaim distance
[IA64] eliminate compile time warnings
[IA64] eliminate compile time warnings
[IA64-SGI] SN SAL call to inject memory errors
[IA64] - Fix MAX_PXM_DOMAINS for systems with > 256 nodes
[IA64] Remove unused variable in sn_sal.h
[IA64] Remove redundant NULL checks before kfree
[IA64] wire up compat_sys_adjtimex()
Diffstat (limited to 'include/asm-ia64/acpi.h')
| -rw-r--r-- | include/asm-ia64/acpi.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index d734585a23cf..09a5dd0e44a8 100644 --- a/include/asm-ia64/acpi.h +++ b/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 |