Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e0b7b2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-core-for-linus' of... 

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Clear CPU mask in affinity_hint when none is provided
  genirq: Add CPU mask affinity hint
  genirq: Remove IRQF_DISABLED from core code
  genirq: Run irq handlers with interrupts disabled
  genirq: Introduce request_any_context_irq()
  genirq: Expose irq_desc->node in proc/irq

Fixed up trivial conflicts in Documentation/feature-removal-schedule.txt
parents e4e47eb1 4308ad80

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -589,3 +589,13 @@ Why: The vtx device nodes have been superseded by vbi device nodes 
	provided by the vtx API, then that functionality should be build

	around the sliced VBI API instead.

Who:	Hans Verkuil <hverkuil@xs4all.nl>



----------------------------



What:	IRQF_DISABLED

When:	2.6.36

Why:	The flag is a NOOP as we run interrupt handlers with interrupts disabled

Who:	Thomas Gleixner <tglx@linutronix.de>



----------------------------

Documentation/filesystems/proc.txt

+4 −0
Original line number Diff line number Diff line
@@ -565,6 +565,10 @@ The default_smp_affinity mask applies to all non-active IRQs, which are the 
IRQs which have not yet been allocated/activated, and hence which lack a

/proc/irq/[0-9]* directory.



The node file on an SMP system shows the node to which the device using the IRQ

reports itself as being attached. This hardware locality information does not

include information about any possible driver locality preference.



prof_cpu_mask specifies which CPUs are to be profiled by the system wide

profiler. Default value is ffffffff (all cpus).

include/linux/interrupt.h

+31 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
 * These flags used only by the kernel as part of the

 * irq handling routines.

 *

 * IRQF_DISABLED - keep irqs disabled when calling the action handler

 * IRQF_DISABLED - keep irqs disabled when calling the action handler.

 *                 DEPRECATED. This flag is a NOOP and scheduled to be removed

 * IRQF_SAMPLE_RANDOM - irq is used to feed the random generator

 * IRQF_SHARED - allow sharing the irq among several devices

 * IRQF_PROBE_SHARED - set by callers when they expect sharing mismatches to occur
@@ -77,6 +78,18 @@ enum { 
	IRQTF_AFFINITY,

};



/**

 * These values can be returned by request_any_context_irq() and

 * describe the context the interrupt will be run in.

 *

 * IRQC_IS_HARDIRQ - interrupt runs in hardirq context

 * IRQC_IS_NESTED - interrupt runs in a nested threaded context

 */

enum {

	IRQC_IS_HARDIRQ	= 0,

	IRQC_IS_NESTED,

};



typedef irqreturn_t (*irq_handler_t)(int, void *);



/**
@@ -120,6 +133,10 @@ request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, 
	return request_threaded_irq(irq, handler, NULL, flags, name, dev);

}



extern int __must_check

request_any_context_irq(unsigned int irq, irq_handler_t handler,

			unsigned long flags, const char *name, void *dev_id);



extern void exit_irq_thread(void);

#else
@@ -141,6 +158,13 @@ request_threaded_irq(unsigned int irq, irq_handler_t handler, 
	return request_irq(irq, handler, flags, name, dev);

}



static inline int __must_check

request_any_context_irq(unsigned int irq, irq_handler_t handler,

			unsigned long flags, const char *name, void *dev_id)

{

	return request_irq(irq, handler, flags, name, dev_id);

}



static inline void exit_irq_thread(void) { }

#endif
@@ -209,6 +233,7 @@ extern int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask); 
extern int irq_can_set_affinity(unsigned int irq);

extern int irq_select_affinity(unsigned int irq);



extern int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m);

#else /* CONFIG_SMP */



static inline int irq_set_affinity(unsigned int irq, const struct cpumask *m)
@@ -223,6 +248,11 @@ static inline int irq_can_set_affinity(unsigned int irq) 


static inline int irq_select_affinity(unsigned int irq)  { return 0; }



static inline int irq_set_affinity_hint(unsigned int irq,

                                        const struct cpumask *m)

{

	return -EINVAL;

}

#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */



#ifdef CONFIG_GENERIC_HARDIRQS

include/linux/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ struct irq_desc { 
	raw_spinlock_t		lock;

#ifdef CONFIG_SMP

	cpumask_var_t		affinity;

	const struct cpumask	*affinity_hint;

	unsigned int		node;

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_var_t		pending_mask;

kernel/irq/handle.c

+0 −3
Original line number Diff line number Diff line
@@ -370,9 +370,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) 
	irqreturn_t ret, retval = IRQ_NONE;

	unsigned int status = 0;



	if (!(action->flags & IRQF_DISABLED))

		local_irq_enable_in_hardirq();



	do {

		trace_irq_handler_entry(irq, action);

		ret = action->handler(irq, action->dev_id);