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

Commit 9505ec08 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

ia64: rename nop->iosapic_nop 



asm-generic/barrier.h defines a nop() macro.
To be able to use this header on ia64, we shouldn't
call local functions/variables nop().

There's one instance where this breaks on ia64:
rename the function to iosapic_nop to avoid the conflict.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent 57f7c037

arch/ia64/kernel/iosapic.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ set_rte (unsigned int gsi, unsigned int irq, unsigned int dest, int mask) 
}

}





static void

static void

nop (struct irq_data *data)

iosapic_nop (struct irq_data *data)

{

{

	/* do nothing... */

	/* do nothing... */

}

}
@@ -415,7 +415,7 @@ iosapic_unmask_level_irq (struct irq_data *data) 
#define iosapic_shutdown_level_irq	mask_irq

#define iosapic_shutdown_level_irq	mask_irq

#define iosapic_enable_level_irq	unmask_irq

#define iosapic_enable_level_irq	unmask_irq

#define iosapic_disable_level_irq	mask_irq

#define iosapic_disable_level_irq	mask_irq

#define iosapic_ack_level_irq		nop

#define iosapic_ack_level_irq		iosapic_nop





static struct irq_chip irq_type_iosapic_level = {

static struct irq_chip irq_type_iosapic_level = {

	.name =			"IO-SAPIC-level",

	.name =			"IO-SAPIC-level",
@@ -453,7 +453,7 @@ iosapic_ack_edge_irq (struct irq_data *data) 
}

}





#define iosapic_enable_edge_irq		unmask_irq

#define iosapic_enable_edge_irq		unmask_irq

#define iosapic_disable_edge_irq	nop

#define iosapic_disable_edge_irq	iosapic_nop





static struct irq_chip irq_type_iosapic_edge = {

static struct irq_chip irq_type_iosapic_edge = {

	.name =			"IO-SAPIC-edge",

	.name =			"IO-SAPIC-edge",