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

Commit b2af018f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: remove mach_mpspec.h 



Move its definitions into mpspec.h.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fb5b33c9

arch/x86/include/asm/mach-default/mach_mpspec.h

deleted100644 → 0
+0 −12
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H

#define _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H



#define MAX_IRQ_SOURCES 256



#if CONFIG_BASE_SMALL == 0

#define MAX_MP_BUSSES 256

#else

#define MAX_MP_BUSSES 32

#endif



#endif /* _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H */

arch/x86/include/asm/mach-generic/mach_mpspec.h

deleted100644 → 0
+0 −12
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H

#define _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H



#define MAX_IRQ_SOURCES 256



/* Summit or generic (i.e. installer) kernels need lots of bus entries. */

/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */

#define MAX_MP_BUSSES 260



extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);



#endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */

arch/x86/include/asm/mpspec.h

+19 −6
Original line number Original line Diff line number Diff line
@@ -9,7 +9,18 @@ extern int apic_version[MAX_APICS]; 
extern int pic_mode;

extern int pic_mode;





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

#include <mach_mpspec.h>



/*

 * Summit or generic (i.e. installer) kernels need lots of bus entries.

 * Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets.

 */

#if CONFIG_BASE_SMALL == 0

# define MAX_MP_BUSSES		260

#else

# define MAX_MP_BUSSES		32

#endif



#define MAX_IRQ_SOURCES		256





extern unsigned int def_to_bigsmp;

extern unsigned int def_to_bigsmp;

extern u8 apicid_2_node[];

extern u8 apicid_2_node[];
@@ -22,13 +33,13 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; 




#define MAX_APICID		256

#define MAX_APICID		256





#else

#else /* CONFIG_X86_64: */





#define MAX_MP_BUSSES		256

#define MAX_MP_BUSSES		256

/* Each PCI slot may be a combo card with its own bus.  4 IRQ pins per slot. */

/* Each PCI slot may be a combo card with its own bus.  4 IRQ pins per slot. */

#define MAX_IRQ_SOURCES		(MAX_MP_BUSSES * 4)

#define MAX_IRQ_SOURCES		(MAX_MP_BUSSES * 4)





#endif

#endif /* CONFIG_X86_64 */





extern void early_find_smp_config(void);

extern void early_find_smp_config(void);

extern void early_get_smp_config(void);

extern void early_get_smp_config(void);
@@ -146,4 +157,6 @@ extern int generic_mps_oem_check(struct mpc_table *, char *, char *); 




extern int default_acpi_madt_oem_check(char *, char *);

extern int default_acpi_madt_oem_check(char *, char *);





extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);



#endif /* _ASM_X86_MPSPEC_H */
 
#endif /* _ASM_X86_MPSPEC_H */