Merge branches 'softirq-for-linus', 'x86-debug-for-linus',...
Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus', 'x86-quirks-for-linus', 'x86-setup-for-linus', 'x86-uv-for-linus' and 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'softirq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softirqs: Make wakeup_softirqd static * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, asm: Restore parentheses around one pushl_cfi argument x86, asm: Fix ancient-GAS workaround x86, asm: Fix CFI macro invocations to deal with shortcomings in gas * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, numa: Assign CPUs to nodes in round-robin manner on fake NUMA * 'x86-quirks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: HPET force enable for CX700 / VIA Epia LT * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, setup: Use string copy operation to optimze copy in kernel compression * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV: Use allocated buffer in tlb_uv.c:tunables_read() * 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, vm86: Fix preemption bug for int1 debug and int3 breakpoint handlers.
Showing
- Kbuild 1 addition, 0 deletionsKbuild
- arch/x86/boot/compressed/misc.c 23 additions, 6 deletionsarch/x86/boot/compressed/misc.c
- arch/x86/include/asm/calling.h 27 additions, 25 deletionsarch/x86/include/asm/calling.h
- arch/x86/include/asm/entry_arch.h 4 additions, 15 deletionsarch/x86/include/asm/entry_arch.h
- arch/x86/include/asm/segment.h 16 additions, 16 deletionsarch/x86/include/asm/segment.h
- arch/x86/kernel/asm-offsets_32.c 1 addition, 3 deletionsarch/x86/kernel/asm-offsets_32.c
- arch/x86/kernel/cpu/intel.c 1 addition, 3 deletionsarch/x86/kernel/cpu/intel.c
- arch/x86/kernel/entry_32.S 3 additions, 3 deletionsarch/x86/kernel/entry_32.S
- arch/x86/kernel/entry_64.S 4 additions, 16 deletionsarch/x86/kernel/entry_64.S
- arch/x86/kernel/quirks.c 2 additions, 0 deletionsarch/x86/kernel/quirks.c
- arch/x86/kernel/tlb_uv.c 8 additions, 3 deletionsarch/x86/kernel/tlb_uv.c
- arch/x86/kernel/traps.c 1 addition, 0 deletionsarch/x86/kernel/traps.c
- arch/x86/kernel/vm86_32.c 8 additions, 2 deletionsarch/x86/kernel/vm86_32.c
- include/linux/interrupt.h 0 additions, 1 deletioninclude/linux/interrupt.h
- kernel/softirq.c 1 addition, 1 deletionkernel/softirq.c
Loading
Please register or sign in to comment