From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Oct 2010 15:25:36 +0000 (-0700)
Subject: Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus',... 
X-Git-Tag: v2.6.37-rc1~148
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=02f36038c568111ad4fc433f6fa760ff5e38fab4

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./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.
---

02f36038c568111ad4fc433f6fa760ff5e38fab4
diff --cc include/linux/interrupt.h
index 414328577ced,0a9141e69241,a0384a4d1e6f,a0384a4d1e6f,a0384a4d1e6f,a0384a4d1e6f,a0384a4d1e6f,a0384a4d1e6f..01b281646251
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@@@@@@@ -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.
         *