Merge branch 'x86/irq' into x86/devel
Conflicts:
arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit_64.c
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
No related branches found
No related tags found
Showing
- arch/x86/kernel/acpi/boot.c 0 additions, 2 deletionsarch/x86/kernel/acpi/boot.c
- arch/x86/kernel/apic_32.c 11 additions, 7 deletionsarch/x86/kernel/apic_32.c
- arch/x86/kernel/entry_32.S 1 addition, 1 deletionarch/x86/kernel/entry_32.S
- arch/x86/kernel/genx2apic_uv_x.c 98 additions, 43 deletionsarch/x86/kernel/genx2apic_uv_x.c
- arch/x86/kernel/i8259.c 8 additions, 14 deletionsarch/x86/kernel/i8259.c
- arch/x86/kernel/io_apic_32.c 2 additions, 2 deletionsarch/x86/kernel/io_apic_32.c
- arch/x86/kernel/io_apic_64.c 5 additions, 1 deletionarch/x86/kernel/io_apic_64.c
- arch/x86/kernel/irq_32.c 119 additions, 97 deletionsarch/x86/kernel/irq_32.c
- arch/x86/kernel/irqinit_64.c 29 additions, 15 deletionsarch/x86/kernel/irqinit_64.c
- arch/x86/kernel/vmiclock_32.c 1 addition, 2 deletionsarch/x86/kernel/vmiclock_32.c
- arch/x86/mach-visws/visws_apic.c 1 addition, 2 deletionsarch/x86/mach-visws/visws_apic.c
- include/asm-x86/desc.h 22 additions, 0 deletionsinclude/asm-x86/desc.h
- include/asm-x86/genapic_64.h 2 additions, 0 deletionsinclude/asm-x86/genapic_64.h
- include/asm-x86/hw_irq.h 103 additions, 2 deletionsinclude/asm-x86/hw_irq.h
- include/asm-x86/hw_irq_32.h 0 additions, 66 deletionsinclude/asm-x86/hw_irq_32.h
- include/asm-x86/hw_irq_64.h 0 additions, 173 deletionsinclude/asm-x86/hw_irq_64.h
- include/asm-x86/irq.h 48 additions, 3 deletionsinclude/asm-x86/irq.h
- include/asm-x86/irq_32.h 0 additions, 51 deletionsinclude/asm-x86/irq_32.h
- include/asm-x86/irq_64.h 0 additions, 51 deletionsinclude/asm-x86/irq_64.h
- include/asm-x86/irq_vectors.h 169 additions, 0 deletionsinclude/asm-x86/irq_vectors.h
Loading
Please register or sign in to comment