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

Commit 23f9b267 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings() 



probe_br_irqs_gsi() is called right after ioapic_init_mappings() and
there are no other users. Move it into ioapic_init_mappings() so the
declaration can disappear and the function can become static.

Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that
change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <1287510389-8388-2-git-send-email-dirk.brandewie@gmail.com>
Signed-off-by: default avatarDirk Brandewie <dirk.j.brandewie@intel.com>
parent 5a7ae78f

arch/x86/include/asm/io_apic.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ struct io_apic_irq_attr; 
extern int io_apic_set_pci_routing(struct device *dev, int irq,

extern int io_apic_set_pci_routing(struct device *dev, int irq,

		 struct io_apic_irq_attr *irq_attr);

		 struct io_apic_irq_attr *irq_attr);

void setup_IO_APIC_irq_extra(u32 gsi);

void setup_IO_APIC_irq_extra(u32 gsi);

extern void ioapic_init_mappings(void);

extern void ioapic_and_gsi_init(void);

extern void ioapic_insert_resources(void);

extern void ioapic_insert_resources(void);





extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);

extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);
@@ -168,8 +168,6 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); 
extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);

extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);

extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);

extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);





extern void probe_nr_irqs_gsi(void);



extern void setup_ioapic_ids_from_mpc(void);

extern void setup_ioapic_ids_from_mpc(void);





struct mp_ioapic_gsi{

struct mp_ioapic_gsi{
@@ -190,7 +188,6 @@ extern void __init pre_init_apic_IRQ0(void); 
static const int timer_through_8259 = 0;

static const int timer_through_8259 = 0;

static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_insert_resources(void) { }

static inline void ioapic_insert_resources(void) { }

static inline void probe_nr_irqs_gsi(void)	{ }

#define gsi_top (NR_IRQS_LEGACY)

#define gsi_top (NR_IRQS_LEGACY)

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

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

arch/x86/kernel/apic/io_apic.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -3639,7 +3639,7 @@ int __init io_apic_get_redir_entries (int ioapic) 
	return reg_01.bits.entries + 1;

	return reg_01.bits.entries + 1;

}

}





void __init probe_nr_irqs_gsi(void)

static void __init probe_nr_irqs_gsi(void)

{

{

	int nr;

	int nr;
@@ -3951,7 +3951,7 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics) 
	return res;

	return res;

}

}





void __init ioapic_init_mappings(void)

void __init ioapic_and_gsi_init(void)

{

{

	unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

	unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

	struct resource *ioapic_res;

	struct resource *ioapic_res;
@@ -3989,6 +3989,8 @@ void __init ioapic_init_mappings(void) 
		ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1;

		ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1;

		ioapic_res++;

		ioapic_res++;

	}

	}



	probe_nr_irqs_gsi();

}

}





void __init ioapic_insert_resources(void)

void __init ioapic_insert_resources(void)

arch/x86/kernel/setup.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1017,10 +1017,7 @@ void __init setup_arch(char **cmdline_p) 
#endif

#endif





	init_apic_mappings();

	init_apic_mappings();

	ioapic_init_mappings();

	ioapic_and_gsi_init();



	/* need to wait for io_apic is mapped */

	probe_nr_irqs_gsi();





	kvm_guest_init();

	kvm_guest_init();