diff options
| author | Alex Elder <aelder@sgi.com> | 2011-10-17 15:42:02 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-17 15:42:02 -0500 |
| commit | 9508534c5f170ada5a745cde0df49732718440e9 (patch) | |
| tree | 2b0f1e19aa529e77720522d13541adedbc46564e /arch/mips/vr41xx/common/irq.c | |
| parent | 5a93a064d27b42e4af1772b0599b53e3241191ac (diff) | |
| parent | a84a79e4d369a73c0130b5858199e949432da4c6 (diff) | |
| download | talos-op-linux-9508534c5f170ada5a745cde0df49732718440e9.tar.gz talos-op-linux-9508534c5f170ada5a745cde0df49732718440e9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Resolved conflicts:
fs/xfs/xfs_trans_priv.h:
- deleted struct xfs_ail field xa_flags
- kept field xa_log_flush in struct xfs_ail
fs/xfs/xfs_trans_ail.c:
- in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
"flush_log = 1" with "ailp->xa_log_flush++"
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'arch/mips/vr41xx/common/irq.c')
| -rw-r--r-- | arch/mips/vr41xx/common/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c index 70a3b85f3757..fad2bef432cd 100644 --- a/arch/mips/vr41xx/common/irq.c +++ b/arch/mips/vr41xx/common/irq.c @@ -34,6 +34,7 @@ static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned; static struct irqaction cascade_irqaction = { .handler = no_action, .name = "cascade", + .flags = IRQF_NO_THREAD, }; int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int)) |
