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

Commit 2a475501 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/asmlinkage changes from Ingo Molnar:
 "As a preparation for Andi Kleen's LTO patchset (link time
  optimizations using GCC's -flto which build time optimization has
  steadily increased in quality over the past few years and might
  eventually be usable for the kernel too) this tree includes a handful
  of preparatory patches that make function calling convention
  annotations consistent again:

   - Mark every function without arguments (or 64bit only) that is used
     by assembly code with asmlinkage()

   - Mark every function with parameters or variables that is used by
     assembly code as __visible.

  For the vanilla kernel this has documentation, consistency and
  debuggability advantages, for the time being"

* 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/asmlinkage: Fix warning in xen asmlinkage change
  x86, asmlinkage, vdso: Mark vdso variables __visible
  x86, asmlinkage, power: Make various symbols used by the suspend asm code visible
  x86, asmlinkage: Make dump_stack visible
  x86, asmlinkage: Make 64bit checksum functions visible
  x86, asmlinkage, paravirt: Add __visible/asmlinkage to xen paravirt ops
  x86, asmlinkage, apm: Make APM data structure used from assembler visible
  x86, asmlinkage: Make syscall tables visible
  x86, asmlinkage: Make several variables used from assembler/linker script visible
  x86, asmlinkage: Make kprobes code visible and fix assembler code
  x86, asmlinkage: Make various syscalls asmlinkage
  x86, asmlinkage: Make 32bit/64bit __switch_to visible
  x86, asmlinkage: Make _*_start_kernel visible
  x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible
  x86, asmlinkage: Change dotraplinkage into __visible on 32bit
  x86: Fix sys_call_table type in asm/syscall.h
parents 3d7e5fc3 eb86b5fd

arch/x86/include/asm/checksum_64.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum); 




/* Do not call this directly. Use the wrappers below */

extern __wsum csum_partial_copy_generic(const void *src, const void *dst,

extern __visible __wsum csum_partial_copy_generic(const void *src, const void *dst,

					int len, __wsum sum,

					int *src_err_ptr, int *dst_err_ptr);

arch/x86/include/asm/hw_irq.h

+58 −62
Original line number Diff line number Diff line
@@ -26,56 +26,56 @@ 
#include <asm/sections.h>



/* Interrupt handlers registered during init_IRQ */

extern void apic_timer_interrupt(void);

extern void x86_platform_ipi(void);

extern void kvm_posted_intr_ipi(void);

extern void error_interrupt(void);

extern void irq_work_interrupt(void);



extern void spurious_interrupt(void);

extern void thermal_interrupt(void);

extern void reschedule_interrupt(void);



extern void invalidate_interrupt(void);

extern void invalidate_interrupt0(void);

extern void invalidate_interrupt1(void);

extern void invalidate_interrupt2(void);

extern void invalidate_interrupt3(void);

extern void invalidate_interrupt4(void);

extern void invalidate_interrupt5(void);

extern void invalidate_interrupt6(void);

extern void invalidate_interrupt7(void);

extern void invalidate_interrupt8(void);

extern void invalidate_interrupt9(void);

extern void invalidate_interrupt10(void);

extern void invalidate_interrupt11(void);

extern void invalidate_interrupt12(void);

extern void invalidate_interrupt13(void);

extern void invalidate_interrupt14(void);

extern void invalidate_interrupt15(void);

extern void invalidate_interrupt16(void);

extern void invalidate_interrupt17(void);

extern void invalidate_interrupt18(void);

extern void invalidate_interrupt19(void);

extern void invalidate_interrupt20(void);

extern void invalidate_interrupt21(void);

extern void invalidate_interrupt22(void);

extern void invalidate_interrupt23(void);

extern void invalidate_interrupt24(void);

extern void invalidate_interrupt25(void);

extern void invalidate_interrupt26(void);

extern void invalidate_interrupt27(void);

extern void invalidate_interrupt28(void);

extern void invalidate_interrupt29(void);

extern void invalidate_interrupt30(void);

extern void invalidate_interrupt31(void);



extern void irq_move_cleanup_interrupt(void);

extern void reboot_interrupt(void);

extern void threshold_interrupt(void);



extern void call_function_interrupt(void);

extern void call_function_single_interrupt(void);

extern asmlinkage void apic_timer_interrupt(void);

extern asmlinkage void x86_platform_ipi(void);

extern asmlinkage void kvm_posted_intr_ipi(void);

extern asmlinkage void error_interrupt(void);

extern asmlinkage void irq_work_interrupt(void);



extern asmlinkage void spurious_interrupt(void);

extern asmlinkage void thermal_interrupt(void);

extern asmlinkage void reschedule_interrupt(void);



extern asmlinkage void invalidate_interrupt(void);

extern asmlinkage void invalidate_interrupt0(void);

extern asmlinkage void invalidate_interrupt1(void);

extern asmlinkage void invalidate_interrupt2(void);

extern asmlinkage void invalidate_interrupt3(void);

extern asmlinkage void invalidate_interrupt4(void);

extern asmlinkage void invalidate_interrupt5(void);

extern asmlinkage void invalidate_interrupt6(void);

extern asmlinkage void invalidate_interrupt7(void);

extern asmlinkage void invalidate_interrupt8(void);

extern asmlinkage void invalidate_interrupt9(void);

extern asmlinkage void invalidate_interrupt10(void);

extern asmlinkage void invalidate_interrupt11(void);

extern asmlinkage void invalidate_interrupt12(void);

extern asmlinkage void invalidate_interrupt13(void);

extern asmlinkage void invalidate_interrupt14(void);

extern asmlinkage void invalidate_interrupt15(void);

extern asmlinkage void invalidate_interrupt16(void);

extern asmlinkage void invalidate_interrupt17(void);

extern asmlinkage void invalidate_interrupt18(void);

extern asmlinkage void invalidate_interrupt19(void);

extern asmlinkage void invalidate_interrupt20(void);

extern asmlinkage void invalidate_interrupt21(void);

extern asmlinkage void invalidate_interrupt22(void);

extern asmlinkage void invalidate_interrupt23(void);

extern asmlinkage void invalidate_interrupt24(void);

extern asmlinkage void invalidate_interrupt25(void);

extern asmlinkage void invalidate_interrupt26(void);

extern asmlinkage void invalidate_interrupt27(void);

extern asmlinkage void invalidate_interrupt28(void);

extern asmlinkage void invalidate_interrupt29(void);

extern asmlinkage void invalidate_interrupt30(void);

extern asmlinkage void invalidate_interrupt31(void);



extern asmlinkage void irq_move_cleanup_interrupt(void);

extern asmlinkage void reboot_interrupt(void);

extern asmlinkage void threshold_interrupt(void);



extern asmlinkage void call_function_interrupt(void);

extern asmlinkage void call_function_single_interrupt(void);



#ifdef CONFIG_TRACING

/* Interrupt handlers registered during init_IRQ */
@@ -172,22 +172,18 @@ extern atomic_t irq_mis_count; 
extern void eisa_set_level_irq(unsigned int irq);



/* SMP */

extern void smp_apic_timer_interrupt(struct pt_regs *);

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_x86_platform_ipi(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

extern __visible void smp_apic_timer_interrupt(struct pt_regs *);

extern __visible void smp_spurious_interrupt(struct pt_regs *);

extern __visible void smp_x86_platform_ipi(struct pt_regs *);

extern __visible void smp_error_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_IO_APIC

extern asmlinkage void smp_irq_move_cleanup_interrupt(void);

#endif

#ifdef CONFIG_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);

extern void smp_call_function_single_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_32

extern void smp_invalidate_interrupt(struct pt_regs *);

#else

extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);

#endif

extern __visible void smp_reschedule_interrupt(struct pt_regs *);

extern __visible void smp_call_function_interrupt(struct pt_regs *);

extern __visible void smp_call_function_single_interrupt(struct pt_regs *);

extern __visible void smp_invalidate_interrupt(struct pt_regs *);

#endif



extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);

arch/x86/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern void (*x86_platform_ipi_callback)(void); 
extern void native_init_IRQ(void);

extern bool handle_irq(unsigned irq, struct pt_regs *regs);



extern unsigned int do_IRQ(struct pt_regs *regs);

extern __visible unsigned int do_IRQ(struct pt_regs *regs);



/* Interrupt vector management */

extern DECLARE_BITMAP(used_vectors, NR_VECTORS);

arch/x86/include/asm/kprobes.h

+5 −5
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ typedef u8 kprobe_opcode_t; 
#define flush_insn_slot(p)	do { } while (0)



/* optinsn template addresses */

extern kprobe_opcode_t optprobe_template_entry;

extern kprobe_opcode_t optprobe_template_val;

extern kprobe_opcode_t optprobe_template_call;

extern kprobe_opcode_t optprobe_template_end;

extern __visible kprobe_opcode_t optprobe_template_entry;

extern __visible kprobe_opcode_t optprobe_template_val;

extern __visible kprobe_opcode_t optprobe_template_call;

extern __visible kprobe_opcode_t optprobe_template_end;

#define MAX_OPTIMIZED_LENGTH (MAX_INSN_SIZE + RELATIVE_ADDR_SIZE)

#define MAX_OPTINSN_SIZE 				\

	(((unsigned long)&optprobe_template_end -	\
@@ -62,7 +62,7 @@ extern kprobe_opcode_t optprobe_template_end; 
extern const int kretprobe_blacklist_size;



void arch_remove_kprobe(struct kprobe *p);

void kretprobe_trampoline(void);

asmlinkage void kretprobe_trampoline(void);



/* Architecture specific copy of original instruction*/

struct arch_specific_insn {

arch/x86/include/asm/paravirt_types.h

+2 −1
Original line number Diff line number Diff line
@@ -387,7 +387,8 @@ extern struct pv_lock_ops pv_lock_ops; 


/* Simple instruction patching code. */

#define DEF_NATIVE(ops, name, code) 					\

	extern const char start_##ops##_##name[], end_##ops##_##name[];	\

	extern const char start_##ops##_##name[] __visible,		\

			  end_##ops##_##name[] __visible;		\

	asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":")



unsigned paravirt_patch_nop(void);