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

Commit b1e05aa2 authored Jul 01, 2006 by Thomas Gleixner Committed by Linus Torvalds Jul 02, 2006

[PATCH] irq-flags: x86_64: Use the new IRQF_ constants

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 8b91fbb8

arch/x86_64/kernel/time.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -889,7 +889,7 @@ int __init time_setup(char *str)
	}		}

	static struct irqaction irq0 = {		static struct irqaction irq0 = {
	timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL		timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL
	};		};

	void __init time_init(void)		void __init time_init(void)

include/asm-x86_64/floppy.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -144,11 +144,11 @@ static int vdma_get_dma_residue(unsigned int dummy)
	static int fd_request_irq(void)		static int fd_request_irq(void)
	{		{
	if(can_use_virtual_dma)		if(can_use_virtual_dma)
	return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,		return request_irq(FLOPPY_IRQ, floppy_hardint,
	"floppy", NULL);		IRQF_DISABLED, "floppy", NULL);
	else		else
	return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,		return request_irq(FLOPPY_IRQ, floppy_interrupt,
	"floppy", NULL);		IRQF_DISABLED, "floppy", NULL);
	}		}

	static unsigned long dma_mem_alloc(unsigned long size)		static unsigned long dma_mem_alloc(unsigned long size)

include/asm-x86_64/signal.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,6 @@ typedef unsigned long sigset_t;
	* SA_FLAGS values:		* SA_FLAGS values:
	*		*
	* SA_ONSTACK indicates that a registered stack_t will be used.		* SA_ONSTACK indicates that a registered stack_t will be used.
	* SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
	* SA_RESTART flag to get restarting signals (which were the default long ago)		* SA_RESTART flag to get restarting signals (which were the default long ago)
	* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.		* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
	* SA_RESETHAND clears the handler when the signal is delivered.		* SA_RESETHAND clears the handler when the signal is delivered.
	@@ -103,7 +102,6 @@ typedef unsigned long sigset_t;

	#define SA_NOMASK SA_NODEFER		#define SA_NOMASK SA_NODEFER
	#define SA_ONESHOT SA_RESETHAND		#define SA_ONESHOT SA_RESETHAND
	#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */

	#define SA_RESTORER 0x04000000		#define SA_RESTORER 0x04000000