Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
Conflicts: include/asm-x86/spinlock.h
No related branches found
No related tags found
Showing
- arch/ia64/include/asm/siginfo.h 0 additions, 5 deletionsarch/ia64/include/asm/siginfo.h
- arch/powerpc/include/asm/siginfo.h 0 additions, 5 deletionsarch/powerpc/include/asm/siginfo.h
- arch/x86/ia32/ia32_signal.c 27 additions, 41 deletionsarch/x86/ia32/ia32_signal.c
- arch/x86/kernel/process_64.c 2 additions, 2 deletionsarch/x86/kernel/process_64.c
- arch/x86/kernel/ptrace.c 4 additions, 3 deletionsarch/x86/kernel/ptrace.c
- arch/x86/kernel/signal_32.c 134 additions, 88 deletionsarch/x86/kernel/signal_32.c
- arch/x86/kernel/signal_64.c 124 additions, 83 deletionsarch/x86/kernel/signal_64.c
- arch/x86/kernel/traps_32.c 3 additions, 1 deletionarch/x86/kernel/traps_32.c
- arch/x86/kernel/traps_64.c 1 addition, 1 deletionarch/x86/kernel/traps_64.c
- arch/x86/kernel/vmlinux_64.lds.S 1 addition, 1 deletionarch/x86/kernel/vmlinux_64.lds.S
- arch/x86/mm/ioremap.c 1 addition, 1 deletionarch/x86/mm/ioremap.c
- include/asm-generic/siginfo.h 2 additions, 0 deletionsinclude/asm-generic/siginfo.h
- include/asm-parisc/siginfo.h 0 additions, 5 deletionsinclude/asm-parisc/siginfo.h
- include/asm-x86/ptrace.h 3 additions, 3 deletionsinclude/asm-x86/ptrace.h
- include/asm-x86/spinlock.h 25 additions, 35 deletionsinclude/asm-x86/spinlock.h
- include/asm-x86/traps.h 12 additions, 0 deletionsinclude/asm-x86/traps.h
Loading
Please register or sign in to comment