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

Commit b77d6adc authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: make hw_controller_type->release exist only for archs needing it 



With Chris Wedgwood <cw@f00f.org>

As suggested by Chris, we can make the "just added" method ->release
conditional to UML only (better: to archs requesting it, i.e.  only UML
currently), so that other archs don't get this unneeded crud, and if UML
won't need it any more we can kill this.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
CC: Ingo Molnar <mingo@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent faec1e99

arch/um/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



# Used in kernel/irq/manage.c and include/linux/irq.h

config IRQ_RELEASE_METHOD

	bool

	default y



menu "UML-specific options"



config MODE_TT

include/linux/irq.h

+3 −0
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ struct hw_interrupt_type { 
	void (*ack)(unsigned int irq);

	void (*end)(unsigned int irq);

	void (*set_affinity)(unsigned int irq, cpumask_t dest);

	/* Currently used only by UML, might disappear one day.*/

#ifdef CONFIG_IRQ_RELEASE_METHOD

	void (*release)(unsigned int irq, void *dev_id);

#endif

};



typedef struct hw_interrupt_type  hw_irq_controller;

kernel/irq/manage.c

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * This file contains driver APIs to the irq subsystem.

 */



#include <linux/config.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/random.h>
@@ -256,8 +257,11 @@ void free_irq(unsigned int irq, void *dev_id) 
			/* Found it - now remove it from the list of entries */

			*pp = action->next;



			/* Currently used only by UML, might disappear one day.*/

#ifdef CONFIG_IRQ_RELEASE_METHOD

			if (desc->handler->release)

				desc->handler->release(irq, dev_id);

#endif



			if (!desc->action) {

				desc->status |= IRQ_DISABLED;