summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c2754c 676cb02 07bd851 50f2d7f 892df7f 68f4d5a b365a85 6554287)
raw | combined (merge: 6c2754c 676cb02 07bd851 50f2d7f 892df7f 68f4d5a b365a85 6554287)
author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sat, 23 Oct 2010 15:25:36 +0000 (08:25 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sat, 23 Oct 2010 15:25:36 +0000 (08:25 -0700) |
* '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.
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.
1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | |||
---|---|---|---|---|---|---|---|---|---|---|
arch/x86/include/asm/entry_arch.h | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
arch/x86/kernel/cpu/intel.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
arch/x86/kernel/entry_64.S | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
arch/x86/kernel/tlb_uv.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
arch/x86/kernel/traps.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
include/linux/interrupt.h | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
kernel/softirq.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | blob | history |
diff --cc arch/x86/include/asm/entry_arch.h
Simple merge
diff --cc arch/x86/kernel/cpu/intel.c
Simple merge
diff --cc arch/x86/kernel/entry_64.S
Simple merge
diff --cc arch/x86/kernel/tlb_uv.c
Simple merge
diff --cc arch/x86/kernel/traps.c
Simple merge
diff --cc include/linux/interrupt.h
index 414328577cedcdb0c67ccdee0c4c4d06661e2aa5,0a9141e69241515fbe50be6630b970d4bc6f6622,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236,a0384a4d1e6f4da4d39a02c0f8ba6634842dd236..01b2816462517509f41a3b732ac32fef3b93da7e
@@@@@@@@@ -408,15 -407,9 -407,10 -407,10 -407,10 -407,10 -407,10 -407,10 +408,14 @@@@@@@@@ asmlinkage void do_softirq(void)
asmlinkage void __do_softirq(void);
extern void open_softirq(int nr, void (*action)(struct softirq_action *));
extern void softirq_init(void);
-------#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
+++++++static inline void __raise_softirq_irqoff(unsigned int nr)
+++++++{
+++++++ trace_softirq_raise((struct softirq_action *)(unsigned long)nr, NULL);
+++++++ or_softirq_pending(1UL << nr);
+++++++}
+++++++
extern void raise_softirq_irqoff(unsigned int nr);
extern void raise_softirq(unsigned int nr);
- ------extern void wakeup_softirqd(void);
/* This is the worklist that queues up per-cpu softirq work.
*
diff --cc kernel/softirq.c
Simple merge