Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7fb0271 authored by Adrian Bunk's avatar Adrian Bunk Committed by Andi Kleen
Browse files

[PATCH] x86-64: remove remaining pc98 code 



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent f475ff35

arch/i386/kernel/io_apic.c

+2 −21
Original line number Diff line number Diff line
@@ -842,8 +842,7 @@ static int __init find_isa_irq_pin(int irq, int type) 


		if ((mp_bus_id_to_type[lbus] == MP_BUS_ISA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_EISA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_MCA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_NEC98

		     mp_bus_id_to_type[lbus] == MP_BUS_MCA

		    ) &&

		    (mp_irqs[i].mpc_irqtype == type) &&

		    (mp_irqs[i].mpc_srcbusirq == irq))
@@ -862,8 +861,7 @@ static int __init find_isa_irq_apic(int irq, int type) 


		if ((mp_bus_id_to_type[lbus] == MP_BUS_ISA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_EISA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_MCA ||

		     mp_bus_id_to_type[lbus] == MP_BUS_NEC98

		     mp_bus_id_to_type[lbus] == MP_BUS_MCA

		    ) &&

		    (mp_irqs[i].mpc_irqtype == type) &&

		    (mp_irqs[i].mpc_srcbusirq == irq))
@@ -993,12 +991,6 @@ static int EISA_ELCR(unsigned int irq) 
#define default_MCA_trigger(idx)	(1)

#define default_MCA_polarity(idx)	(0)



/* NEC98 interrupts are always polarity zero edge triggered,

 * when listed as conforming in the MP table. */



#define default_NEC98_trigger(idx)     (0)

#define default_NEC98_polarity(idx)    (0)



static int __init MPBIOS_polarity(int idx)

{

	int bus = mp_irqs[idx].mpc_srcbus;
@@ -1033,11 +1025,6 @@ static int __init MPBIOS_polarity(int idx) 
					polarity = default_MCA_polarity(idx);

					break;

				}

				case MP_BUS_NEC98: /* NEC 98 pin */

				{

					polarity = default_NEC98_polarity(idx);

					break;

				}

				default:

				{

					printk(KERN_WARNING "broken BIOS!!\n");
@@ -1107,11 +1094,6 @@ static int MPBIOS_trigger(int idx) 
					trigger = default_MCA_trigger(idx);

					break;

				}

				case MP_BUS_NEC98: /* NEC 98 pin */

				{

					trigger = default_NEC98_trigger(idx);

					break;

				}

				default:

				{

					printk(KERN_WARNING "broken BIOS!!\n");
@@ -1173,7 +1155,6 @@ static int pin_2_irq(int idx, int apic, int pin) 
		case MP_BUS_ISA: /* ISA pin */

		case MP_BUS_EISA:

		case MP_BUS_MCA:

		case MP_BUS_NEC98:

		{

			irq = mp_irqs[idx].mpc_srcbusirq;

			break;

arch/i386/kernel/mpparse.c

+0 −2
Original line number Diff line number Diff line
@@ -249,8 +249,6 @@ static void __init MP_bus_info (struct mpc_config_bus *m) 
		mp_current_pci_id++;

	} else if (strncmp(str, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) {

		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_MCA;

	} else if (strncmp(str, BUSTYPE_NEC98, sizeof(BUSTYPE_NEC98)-1) == 0) {

		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_NEC98;

	} else {

		printk(KERN_WARNING "Unknown bustype %s - ignoring\n", str);

	}

include/asm-i386/mpspec_def.h

+0 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct mpc_config_bus 
#define BUSTYPE_TC	"TC"

#define BUSTYPE_VME	"VME"

#define BUSTYPE_XPRESS	"XPRESS"

#define BUSTYPE_NEC98	"NEC98"



struct mpc_config_ioapic

{
@@ -182,7 +181,6 @@ enum mp_bustype { 
	MP_BUS_EISA,

	MP_BUS_PCI,

	MP_BUS_MCA,

	MP_BUS_NEC98

};

#endif