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

Commit 277d5b40 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, asmlinkage: Make several variables used from assembler/linker script visible 



Plus one function, load_gs_index().

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-10-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 04bb591c

arch/x86/include/asm/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
 * ZERO_PAGE is a global shared page that is always zero: used

 * for zero-mapped memory areas etc..

 */

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]

	__visible;

#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))



extern spinlock_t pgd_lock;

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ union irq_stack_union { 
	};

};



DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union);

DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union) __visible;

DECLARE_INIT_PER_CPU(irq_stack_union);



DECLARE_PER_CPU(char *, irq_stack_ptr);

arch/x86/include/asm/special_insns.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline void native_wbinvd(void) 
	asm volatile("wbinvd": : :"memory");

}



extern void native_load_gs_index(unsigned);

extern asmlinkage void native_load_gs_index(unsigned);



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

arch/x86/kernel/cpu/amd.c

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val) 
 *	performance at the same time..

 */



extern void vide(void);

__asm__(".align 4\nvide: ret");

extern __visible void vide(void);

__asm__(".globl vide\n\t.align 4\nvide: ret");



static void init_amd_k5(struct cpuinfo_x86 *c)

{

arch/x86/kernel/cpu/common.c

+2 −2
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, 
				    (unsigned long) debug_idt_table };



DEFINE_PER_CPU_FIRST(union irq_stack_union,

		     irq_stack_union) __aligned(PAGE_SIZE);

		     irq_stack_union) __aligned(PAGE_SIZE) __visible;



/*

 * The following four percpu variables are hot.  Align current_task to
@@ -1093,7 +1093,7 @@ EXPORT_PER_CPU_SYMBOL(kernel_stack); 
DEFINE_PER_CPU(char *, irq_stack_ptr) =

	init_per_cpu_var(irq_stack_union.irq_stack) + IRQ_STACK_SIZE - 64;



DEFINE_PER_CPU(unsigned int, irq_count) = -1;

DEFINE_PER_CPU(unsigned int, irq_count) __visible = -1;



DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);