powerpc: have only one definition of __irq_offset_value (868accb7) · Commits · jan.koester / Linux

arch/powerpc/kernel/irq.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,11 @@
		#include <asm/paca.h>
		#endif

		int __irq_offset_value;
		#ifdef CONFIG_PPC32
		EXPORT_SYMBOL(__irq_offset_value);
		#endif

		static int ppc_spurious_interrupts;

		#if defined(CONFIG_PPC_ISERIES) && defined(CONFIG_SMP)
		@@ -98,7 +103,6 @@ extern atomic_t ipi_sent;
		EXPORT_SYMBOL(irq_desc);

		int distribute_irqs = 1;
		int __irq_offset_value;
		u64 ppc64_interrupt_controller;
		#endif /* CONFIG_PPC64 */

+0 −4

Original line number	Diff line number	Diff line
		@@ -57,10 +57,6 @@ extern void power4_idle(void);
		boot_infos_t *boot_infos;
		struct ide_machdep_calls ppc_ide_md;

		/* XXX should go elsewhere */
		int __irq_offset_value;
		EXPORT_SYMBOL(__irq_offset_value);

		int boot_cpuid;
		EXPORT_SYMBOL_GPL(boot_cpuid);
		int boot_cpuid_phys;