Merge branch 'irq/for-x86' into irq/core
Pull in the branch which can be consumed by x86 to build their changes on top.
This commit is contained in:
@@ -327,6 +327,7 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
|
||||
* @irq_write_msi_msg: optional to write message content for MSI
|
||||
* @irq_get_irqchip_state: return the internal state of an interrupt
|
||||
* @irq_set_irqchip_state: set the internal state of a interrupt
|
||||
* @irq_set_vcpu_affinity: optional to target a vCPU in a virtual machine
|
||||
* @flags: chip specific flags
|
||||
*/
|
||||
struct irq_chip {
|
||||
@@ -369,6 +370,8 @@ struct irq_chip {
|
||||
int (*irq_get_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool *state);
|
||||
int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
|
||||
|
||||
int (*irq_set_vcpu_affinity)(struct irq_data *data, void *vcpu_info);
|
||||
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
@@ -422,6 +425,7 @@ extern void irq_cpu_online(void);
|
||||
extern void irq_cpu_offline(void);
|
||||
extern int irq_set_affinity_locked(struct irq_data *data,
|
||||
const struct cpumask *cpumask, bool force);
|
||||
extern int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info);
|
||||
|
||||
#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
|
||||
void irq_move_irq(struct irq_data *data);
|
||||
@@ -469,6 +473,8 @@ extern int irq_chip_set_affinity_parent(struct irq_data *data,
|
||||
const struct cpumask *dest,
|
||||
bool force);
|
||||
extern int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on);
|
||||
extern int irq_chip_set_vcpu_affinity_parent(struct irq_data *data,
|
||||
void *vcpu_info);
|
||||
#endif
|
||||
|
||||
/* Handling of unhandled and spurious interrupts: */
|
||||
|
Reference in New Issue
Block a user