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

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

x86: eliminate asm/mach-*/mach_mpparse.h 



Move the definition to mpparse.h.

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

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H

#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H



static inline int

generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)

{

	return 0;

}



/* Hook from generic ACPI tables.c */

static inline int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	return 0;

}





#endif /* _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H */

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

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H

#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H



extern int generic_mps_oem_check(struct mpc_table *, char *, char *);



extern int default_acpi_madt_oem_check(char *, char *);



#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */

arch/x86/include/asm/mpspec.h

+4 −0
Original line number Diff line number Diff line
@@ -142,4 +142,8 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map) 


extern physid_mask_t phys_cpu_present_map;



extern int generic_mps_oem_check(struct mpc_table *, char *, char *);



extern int default_acpi_madt_oem_check(char *, char *);



#endif /* _ASM_X86_MPSPEC_H */

arch/x86/kernel/acpi/boot.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ EXPORT_SYMBOL(acpi_disabled); 


#ifdef	CONFIG_X86_LOCAL_APIC

#include <mach_apic.h>

#include <mach_mpparse.h>

#endif				/* CONFIG_X86_LOCAL_APIC */



#endif				/* X86 */

arch/x86/kernel/es7000_32.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <asm/smp.h>

#include <asm/atomic.h>

#include <asm/apicdef.h>

#include <mach_mpparse.h>

#include <asm/genapic.h>

#include <asm/setup.h>