mirror of https://gitee.com/openkylin/linux.git
48b1fddbb1
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.
Conflicts:
arch/x86/kernel/irqinit.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
||
|---|---|---|
| .. | ||
| Makefile | ||
| apic.c | ||
| apic_flat_64.c | ||
| bigsmp_32.c | ||
| es7000_32.c | ||
| io_apic.c | ||
| ipi.c | ||
| nmi.c | ||
| numaq_32.c | ||
| probe_32.c | ||
| probe_64.c | ||
| summit_32.c | ||
| x2apic_cluster.c | ||
| x2apic_phys.c | ||
| x2apic_uv_x.c | ||