diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
| commit | 8461689c67fc2ad3040bc019cccb541bccb5648f (patch) | |
| tree | eafcf756975739ef04aa91be2e053d6e1e8b9ccb /arch/x86/kernel/vsmp_64.c | |
| parent | x86/vsmp: Fix linker error when CONFIG_PROC_FS is not set (diff) | |
| parent | irq/apic: Use config_enabled(CONFIG_SMP) checks to clean up irq_set_affinity(... (diff) | |
| download | linux-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.xz linux-8461689c67fc2ad3040bc019cccb541bccb5648f.zip | |
Merge branch 'x86/apic' into x86/platform
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
0 files changed, 0 insertions, 0 deletions