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

Commit 0962f402 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1 



Conflicts:
	arch/x86/kernel/process_32.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 19268ed7 8d7ccaa5

arch/x86/kernel/cpu/mtrr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ struct var_mtrr_range_state { 
	mtrr_type type;

};



struct var_mtrr_range_state __initdata range_state[RANGE_NUM];

static struct var_mtrr_range_state __initdata range_state[RANGE_NUM];

static int __initdata debug_print;



static int __init

arch/x86/kernel/ioport.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/slab.h>

#include <linux/thread_info.h>

#include <linux/syscalls.h>

#include <asm/syscalls.h>



/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */

static void set_bitmap(unsigned long *bitmap, unsigned int base,

arch/x86/kernel/ipi.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


#ifdef CONFIG_X86_32

#include <mach_apic.h>

#include <mach_ipi.h>



/*

 * the following functions deal with sending IPIs between CPUs.

 *
@@ -147,7 +149,6 @@ void send_IPI_mask_sequence(cpumask_t mask, int vector) 
}



/* must come after the send_IPI functions above for inlining */

#include <mach_ipi.h>

static int convert_apicid_to_cpu(int apic_id)

{

	int i;

arch/x86/kernel/ldt.c

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

#include <asm/desc.h>

#include <asm/mmu_context.h>

#include <asm/syscalls.h>



#ifdef CONFIG_SMP

static void flush_ldt(void *current_mm)

arch/x86/kernel/process_32.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
#include <asm/cpu.h>

#include <asm/kdebug.h>

#include <asm/idle.h>

#include <asm/syscalls.h>

#include <asm/smp.h>



asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");