These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / sparc / kernel / sun4m_irq.c

diff --git a/kernel/arch/sparc/kernel/sun4m_irq.c b/kernel/arch/sparc/kernel/sun4m_irq.c
index 8bb3b3f..da737c7 100644 (file)
--- a/kernel/arch/sparc/kernel/sun4m_irq.c
+++ b/kernel/arch/sparc/kernel/sun4m_irq.c
@@ -188,9 +188,10 @@ static unsigned long sun4m_imask[0x50] = {
 
 static void sun4m_mask_irq(struct irq_data *data)
 {
-       struct sun4m_handler_data *handler_data = data->handler_data;
+       struct sun4m_handler_data *handler_data;
        int cpu = smp_processor_id();
 
+       handler_data = irq_data_get_irq_handler_data(data);
        if (handler_data->mask) {
                unsigned long flags;
 
@@ -206,9 +207,10 @@ static void sun4m_mask_irq(struct irq_data *data)
 
 static void sun4m_unmask_irq(struct irq_data *data)
 {
-       struct sun4m_handler_data *handler_data = data->handler_data;
+       struct sun4m_handler_data *handler_data;
        int cpu = smp_processor_id();
 
+       handler_data = irq_data_get_irq_handler_data(data);
        if (handler_data->mask) {
                unsigned long flags;