소스 검색

genirq: Fix CONFIG_GENIRQ_NO_DEPRECATED=y build

This option can be set to verify the full conversion to the new chip
functions. Fix the fallout of the patch rework, so the core code
compiles and works with it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner 14 년 전
부모
커밋
c0a19ebc01
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      kernel/irq/dummychip.c
  2. 1 1
      kernel/irq/irqdesc.c

+ 1 - 1
kernel/irq/dummychip.c

@@ -31,7 +31,7 @@ static unsigned int noop_ret(struct irq_data *data)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_CRUFT
+#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
 static void compat_noop(unsigned int irq) { }
 static void compat_noop(unsigned int irq) { }
 #define END_INIT .end = compat_noop
 #define END_INIT .end = compat_noop
 #else
 #else

+ 1 - 1
kernel/irq/irqdesc.c

@@ -118,7 +118,7 @@ static void free_masks(struct irq_desc *desc)
 #ifdef CONFIG_GENERIC_PENDING_IRQ
 #ifdef CONFIG_GENERIC_PENDING_IRQ
 	free_cpumask_var(desc->pending_mask);
 	free_cpumask_var(desc->pending_mask);
 #endif
 #endif
-	free_cpumask_var(desc->affinity);
+	free_cpumask_var(desc->irq_data.affinity);
 }
 }
 #else
 #else
 static inline void free_masks(struct irq_desc *desc) { }
 static inline void free_masks(struct irq_desc *desc) { }