diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 22:12:55 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 22:12:55 (GMT) |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /arch/x86/mm/srat_64.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) | |
| download | linux-6a385db5ce7f1fd2c68ec511e44587b67dab8fca.tar.xz | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'arch/x86/mm/srat_64.c')
| -rw-r--r-- | arch/x86/mm/srat_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 09737c8..15df1ba 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -21,6 +21,7 @@ #include <asm/numa.h> #include <asm/e820.h> #include <asm/genapic.h> +#include <asm/uv/uv.h> int acpi_numa __initdata; |