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

Commit eddb0c55 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by H. Peter Anvin
Browse files

x86, ioapic: Fix the types of gsi values 



This patches fixes the types of gsi_base and gsi_end values in
struct mp_ioapic_gsi, and the gsi parameter of mp_find_ioapic
and mp_find_ioapic_pin

A gsi is cannonically a u32, not an int.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-8-git-send-email-ebiederm@xmission.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 4b6b19a1

arch/x86/include/asm/io_apic.h

+5 −5
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ extern void ioapic_write_entry(int apic, int pin, 
extern void setup_ioapic_ids_from_mpc(void);



struct mp_ioapic_gsi{

	int gsi_base;

	int gsi_end;

	u32 gsi_base;

	u32 gsi_end;

};

extern struct mp_ioapic_gsi  mp_gsi_routing[];

int mp_find_ioapic(int gsi);

int mp_find_ioapic_pin(int ioapic, int gsi);

int mp_find_ioapic(u32 gsi);

int mp_find_ioapic_pin(int ioapic, u32 gsi);

void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);

extern void __init pre_init_apic_IRQ0(void);
@@ -197,7 +197,7 @@ static const int timer_through_8259 = 0; 
static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_insert_resources(void) { }

static inline void probe_nr_irqs_gsi(void)	{ }

static inline int mp_find_ioapic(int gsi) { return 0; }

static inline int mp_find_ioapic(u32 gsi) { return 0; }



struct io_apic_irq_attr;

static inline int io_apic_set_pci_routing(struct device *dev, int irq,

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -4247,7 +4247,7 @@ void __init ioapic_insert_resources(void) 
	}

}



int mp_find_ioapic(int gsi)

int mp_find_ioapic(u32 gsi)

{

	int i = 0;
@@ -4262,7 +4262,7 @@ int mp_find_ioapic(int gsi) 
	return -1;

}



int mp_find_ioapic_pin(int ioapic, int gsi)

int mp_find_ioapic_pin(int ioapic, u32 gsi)

{

	if (WARN_ON(ioapic == -1))

		return -1;