On 07/11/2011 10:01, "Jan Beulich" <JBeulich@xxxxxxxx> wrote:
> ... as they're not really arch-specific.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
> --- a/xen/arch/ia64/xen/irq.c
> +++ b/xen/arch/ia64/xen/irq.c
> @@ -105,15 +105,6 @@ void __do_IRQ_guest(int irq);
> * Special irq handlers.
> */
>
> -void no_action(int cpl, void *dev_id, struct pt_regs *regs) { }
> -
> -/*
> - * Generic no controller code
> - */
> -
> -static void enable_none(unsigned int irq) { }
> -static unsigned int startup_none(unsigned int irq) { return 0; }
> -static void disable_none(unsigned int irq) { }
> static void ack_none(unsigned int irq)
> {
> /*
> @@ -124,18 +115,14 @@ static void ack_none(unsigned int irq)
> printk(KERN_ERR "Unexpected irq vector 0x%x on CPU %u!\n", irq,
> smp_processor_id());
> }
>
> -/* startup is the same as "enable", shutdown is same as "disable" */
> -#define shutdown_none disable_none
> -#define end_none enable_none
> -
> hw_irq_controller no_irq_type = {
> - "none",
> - startup_none,
> - shutdown_none,
> - enable_none,
> - disable_none,
> - ack_none,
> - end_none
> + .typename = "none",
> + .startup = irq_startup_none,
> + .shutdown = irq_shutdown_none,
> + .enable = irq_enable_none,
> + .disable = irq_disable_none,
> + .ack = ack_none,
> + .end = irq_actor_none
> };
>
> /*
> --- a/xen/arch/x86/irq.c
> +++ b/xen/arch/x86/irq.c
> @@ -356,10 +356,6 @@ int __init init_irq_data(void)
>
> static void __do_IRQ_guest(int vector);
>
> -void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs) { }
> -
> -void irq_actor_none(struct irq_desc *desc) { }
> -unsigned int irq_startup_none(struct irq_desc *desc) { return 0; }
> static void ack_none(struct irq_desc *desc)
> {
> ack_bad_irq(desc->irq);
> --- a/xen/common/irq.c
> +++ b/xen/common/irq.c
> @@ -26,3 +26,16 @@ int init_one_irq_desc(struct irq_desc *d
>
> return err;
> }
> +
> +void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs)
> +{
> +}
> +
> +void irq_actor_none(struct irq_desc *desc)
> +{
> +}
> +
> +unsigned int irq_startup_none(struct irq_desc *desc)
> +{
> + return 0;
> +}
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home