Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: include mach_apic.h in smpboot_64.c and smpboot.c

Browse Source 
After the inclusion, a lot of files needs fixing for conflicts,
some of them in the headers themselves, to accomodate for both
i386 and x86_64 versions.

[ mingo@elte.hu: build fix ]

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber de Oliveira Costa 2008-03-19 14:25:53 -03:00 committed by Ingo Molnar
parent 4370ee4d3b
commit f6bc402909
10 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/acpi/boot.c
View File

@ -40,6 +40,10 @@
#include <asm/io.h>
#include <asm/mpspec.h>
#ifdef CONFIG_X86_LOCAL_APIC
# include <mach_apic.h>
#endif
static int __initdata acpi_force = 0;
#ifdef CONFIG_ACPI

2
arch/x86/kernel/mpparse_64.c
View File

@ -30,6 +30,8 @@
#include <asm/proto.h>
#include <asm/acpi.h>
#include <mach_apic.h>
/* Have we found an MP table */
int smp_found_config;
unsigned int __cpuinitdata maxcpus = NR_CPUS;

2
arch/x86/kernel/smpboot.c
View File

@ -11,6 +11,8 @@
#include <asm/cpu.h>
#include <asm/numa.h>
#include <mach_apic.h>
/* Number of siblings per CPU package */
int smp_num_siblings = 1;
EXPORT_SYMBOL(smp_num_siblings);

1
arch/x86/kernel/smpboot_64.c
View File

@ -61,6 +61,7 @@
#include <asm/numa.h>
#include <mach_wakecpu.h>
#include <mach_apic.h>
#include <smpboot_hooks.h>
/* Set when the idlers are all forked */

2
arch/x86/vdso/Makefile
View File

@ -39,7 +39,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
$(vobjs): KBUILD_CFLAGS = $(CFL)
$(vobjs): KBUILD_CFLAGS += $(CFL)
targets += vdso-syms.lds
obj-$(VDSO64-y) += vdso-syms.lds

1
include/asm-x86/apic.h
View File

@ -128,7 +128,6 @@ extern void enable_NMI_through_LVT0(void);
* On 32bit this is mach-xxx local
*/
#ifdef CONFIG_X86_64
extern void setup_apic_routing(void);
extern void early_init_lapic_mapping(void);
#endif

6
include/asm-x86/apicdef.h
View File

@ -12,12 +12,6 @@
#define APIC_ID 0x20
#ifdef CONFIG_X86_64
# define APIC_ID_MASK (0xFFu<<24)
# define GET_APIC_ID(x) (((x)>>24)&0xFFu)
# define SET_APIC_ID(x) (((x)<<24))
#endif
#define APIC_LVR 0x30
#define APIC_LVR_MASK 0xFF00FF
#define GET_APIC_VERSION(x) ((x)&0xFFu)

11
include/asm-x86/mach-default/mach_apic.h
View File

@ -54,21 +54,27 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
return phys_map;
}
#ifdef CONFIG_X86_64
extern void setup_apic_routing(void);
#else
static inline void setup_apic_routing(void)
{
printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
"Flat", nr_ioapics);
}
#endif
static inline int multi_timer_check(int apic, int irq)
{
return 0;
}
#ifdef CONFIG_X86_32
static inline int apicid_to_node(int logical_apicid)
{
return 0;
}
#endif
/* Mapping from cpu number to logical apicid */
static inline int cpu_to_logical_apicid(int cpu)
@ -78,8 +84,13 @@ static inline int cpu_to_logical_apicid(int cpu)
static inline int cpu_present_to_apicid(int mps_cpu)
{
#ifdef CONFIG_X86_64
if (cpu_present(mps_cpu))
return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
#else
if (mps_cpu < get_physical_broadcast())
return mps_cpu;
#endif
else
return BAD_APICID;
}

5
include/asm-x86/mach-default/mach_apicdef.h
View File

@ -3,7 +3,12 @@
#include <asm/apic.h>
#ifdef CONFIG_X86_64
#define APIC_ID_MASK (0xFFu<<24)
#define SET_APIC_ID(x) (((x)<<24))
#else
#define APIC_ID_MASK (0xF<<24)
#endif
static inline unsigned get_apic_id(unsigned long x)
{

9
include/asm-x86/smp_64.h
View File

@ -19,14 +19,6 @@ extern cpumask_t cpu_callin_map;
extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
void *info, int wait);
static inline int cpu_present_to_apicid(int mps_cpu)
{
if (cpu_present(mps_cpu))
return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
else
return BAD_APICID;
}
#ifdef CONFIG_SMP
#define raw_smp_processor_id() read_pda(cpunumber)
@ -64,6 +56,7 @@ static __inline int logical_smp_processor_id(void)
return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));
}
#include <mach_apicdef.h>
static inline int hard_smp_processor_id(void)
{
/* we don't want to mark this access volatile - bad code generation */