diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 09:39:02 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 09:39:02 (GMT) |
| commit | d028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch) | |
| tree | 6bd73a5c70b407491dc9d40ecb9e95b48233d004 /include/asm-x86/numaq.h | |
| parent | f57e91682d141ea50d8c6d42cdc251b6256a3755 (diff) | |
| parent | 183fe065652dbd64953afa9f389327e23e97967f (diff) | |
| download | linux-d028203c0446c7f65ed2b22342a56f03c6c4a6c1.tar.xz | |
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'include/asm-x86/numaq.h')
| -rw-r--r-- | include/asm-x86/numaq.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-x86/numaq.h b/include/asm-x86/numaq.h index 94b86c3..ef068d24 100644 --- a/include/asm-x86/numaq.h +++ b/include/asm-x86/numaq.h @@ -28,6 +28,7 @@ #ifdef CONFIG_X86_NUMAQ +extern int found_numaq; extern int get_memcfg_numaq(void); /* @@ -156,9 +157,10 @@ struct sys_cfg_data { struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */ }; -static inline unsigned long *get_zholes_size(int nid) +#else +static inline int get_memcfg_numaq(void) { - return NULL; + return 0; } #endif /* CONFIG_X86_NUMAQ */ #endif /* NUMAQ_H */ |