powerpc: make iSeries use generic virtual irq mapping (d9ae2bad) · Commits · e / devices / android_kernel_teracube_2e

arch/powerpc/kernel/irq.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -311,7 +311,6 @@ void __init init_IRQ(void)
		}

		#ifdef CONFIG_PPC64
		#ifndef CONFIG_PPC_ISERIES
		/*
		* Virtual IRQ mapping code, used on systems with XICS interrupt controllers.
		*/
		@@ -420,8 +419,6 @@ unsigned int real_irq_to_virt_slowpath(unsigned int real_irq)

		}

		#endif /* CONFIG_PPC_ISERIES */

		#ifdef CONFIG_IRQSTACKS
		struct thread_info *softirq_ctx[NR_CPUS];
		struct thread_info *hardirq_ctx[NR_CPUS];

+3 −22

Original line number	Diff line number	Diff line
		@@ -42,13 +42,6 @@
		#include "irq.h"
		#include "call_pci.h"

		/* This maps virtual irq numbers to real irqs */
		unsigned int virt_irq_to_real_map[NR_IRQS];

		/* The next available virtual irq number */
		/* Note: the pcnet32 driver assumes irq numbers < 2 aren't valid. :( */
		static int next_virtual_irq = 2;

		static long Pci_Interrupt_Count;
		static long Pci_Event_Count;

		@@ -350,26 +343,14 @@ static hw_irq_controller iSeries_IRQ_handler = {
		int __init iSeries_allocate_IRQ(HvBusNumber busNumber,
		HvSubBusNumber subBusNumber, HvAgentId deviceId)
		{
		unsigned int realirq, virtirq;
		int virtirq;
		unsigned int realirq;
		u8 idsel = (deviceId >> 4);
		u8 function = deviceId & 7;

		virtirq = next_virtual_irq++;
		realirq = ((busNumber - 1) << 6) + ((idsel - 1) << 3) + function;
		virt_irq_to_real_map[virtirq] = realirq;
		virtirq = virt_irq_create_mapping(realirq);

		irq_desc[virtirq].handler = &iSeries_IRQ_handler;
		return virtirq;
		}

		int virt_irq_create_mapping(unsigned int real_irq)
		{
		BUG(); /* Don't call this on iSeries, yet */

		return 0;
		}

		void virt_irq_init(void)
		{
		return;
		}