Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core
Merge these pending x86 tree changes into the perfcounters tree to avoid conflicts.
Showing
- arch/x86/Kconfig 2 additions, 10 deletionsarch/x86/Kconfig
- arch/x86/ia32/ia32_signal.c 29 additions, 39 deletionsarch/x86/ia32/ia32_signal.c
- arch/x86/include/asm/bitops.h 9 additions, 1 deletionarch/x86/include/asm/bitops.h
- arch/x86/include/asm/byteorder.h 29 additions, 45 deletionsarch/x86/include/asm/byteorder.h
- arch/x86/include/asm/dwarf2.h 66 additions, 31 deletionsarch/x86/include/asm/dwarf2.h
- arch/x86/include/asm/hw_irq.h 1 addition, 3 deletionsarch/x86/include/asm/hw_irq.h
- arch/x86/include/asm/irq.h 0 additions, 4 deletionsarch/x86/include/asm/irq.h
- arch/x86/include/asm/irq_regs_32.h 2 additions, 0 deletionsarch/x86/include/asm/irq_regs_32.h
- arch/x86/include/asm/linkage.h 60 additions, 0 deletionsarch/x86/include/asm/linkage.h
- arch/x86/include/asm/syscalls.h 1 addition, 1 deletionarch/x86/include/asm/syscalls.h
- arch/x86/include/asm/tsc.h 1 addition, 7 deletionsarch/x86/include/asm/tsc.h
- arch/x86/kernel/Makefile 2 additions, 1 deletionarch/x86/kernel/Makefile
- arch/x86/kernel/entry_32.S 249 additions, 228 deletionsarch/x86/kernel/entry_32.S
- arch/x86/kernel/entry_64.S 725 additions, 635 deletionsarch/x86/kernel/entry_64.S
- arch/x86/kernel/irq_64.c 10 additions, 14 deletionsarch/x86/kernel/irq_64.c
- arch/x86/kernel/irqinit_32.c 1 addition, 1 deletionarch/x86/kernel/irqinit_32.c
- arch/x86/kernel/irqinit_64.c 0 additions, 66 deletionsarch/x86/kernel/irqinit_64.c
- arch/x86/kernel/signal.c 382 additions, 185 deletionsarch/x86/kernel/signal.c
- arch/x86/kernel/signal_64.c 0 additions, 516 deletionsarch/x86/kernel/signal_64.c
- arch/x86/kernel/time_64.c 2 additions, 0 deletionsarch/x86/kernel/time_64.c
Loading
Please register or sign in to comment