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

Commit 816fb417 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull weak function declaration removal from Bjorn Helgaas:
 "The "weak" attribute is commonly used for the default version of a
  function, where an architecture can override it by providing a strong
  version.

  Some header file declarations included the "weak" attribute.  That's
  error-prone because it causes every implementation to be weak, with no
  strong version at all, and the linker chooses one based on link order.

  What we want is the "weak" attribute only on the *definition* of the
  default implementation.  These changes remove "weak" from the
  declarations, leaving it on the default definitions"

* tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  uprobes: Remove "weak" from function declarations
  memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
  kgdb: Remove "weak" from kgdb_arch_pc() declaration
  ARC: kgdb: generic kgdb_arch_pc() suffices
  vmcore: Remove "weak" from function declarations
  clocksource: Remove "weak" from clocksource_default_clock() declaration
  x86, intel-mid: Remove "weak" from function declarations
  audit: Remove "weak" from audit_classify_compat_syscall() declaration
parents 8c81f48e 271a9c35

arch/arc/kernel/kgdb.c

+0 −5
Original line number Diff line number Diff line
@@ -158,11 +158,6 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, 
	return -1;

}



unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)

{

	return instruction_pointer(regs);

}



int kgdb_arch_init(void)

{

	single_step_data.armed = 0;

arch/x86/platform/intel-mid/intel_mid_weak_decls.h

+3 −4
Original line number Diff line number Diff line
@@ -10,10 +10,9 @@ 
 */





/* __attribute__((weak)) makes these declarations overridable */

/* For every CPU addition a new get_<cpuname>_ops interface needs

 * to be added.

 */

extern void *get_penwell_ops(void) __attribute__((weak));

extern void *get_cloverview_ops(void) __attribute__((weak));

extern void *get_tangier_ops(void) __attribute__((weak));
 
extern void *get_penwell_ops(void);

extern void *get_cloverview_ops(void);

extern void *get_tangier_ops(void);

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ extern unsigned compat_dir_class[]; 
extern unsigned compat_chattr_class[];

extern unsigned compat_signal_class[];



extern int __weak audit_classify_compat_syscall(int abi, unsigned syscall);

extern int audit_classify_compat_syscall(int abi, unsigned syscall);



/* audit_names->type values */

#define	AUDIT_TYPE_UNKNOWN	0	/* we don't know yet */

include/linux/clocksource.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ extern struct clocksource* clocksource_get_next(void); 
extern void clocksource_change_rating(struct clocksource *cs, int rating);

extern void clocksource_suspend(void);

extern void clocksource_resume(void);

extern struct clocksource * __init __weak clocksource_default_clock(void);

extern struct clocksource * __init clocksource_default_clock(void);

extern void clocksource_mark_unstable(struct clocksource *cs);



extern u64

include/linux/crash_dump.h

+7 −8
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ 
extern unsigned long long elfcorehdr_addr;

extern unsigned long long elfcorehdr_size;



extern int __weak elfcorehdr_alloc(unsigned long long *addr,

				   unsigned long long *size);

extern void __weak elfcorehdr_free(unsigned long long addr);

extern ssize_t __weak elfcorehdr_read(char *buf, size_t count, u64 *ppos);

extern ssize_t __weak elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos);

extern int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,

extern int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size);

extern void elfcorehdr_free(unsigned long long addr);

extern ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos);

extern ssize_t elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos);

extern int remap_oldmem_pfn_range(struct vm_area_struct *vma,

				  unsigned long from, unsigned long pfn,

				  unsigned long size, pgprot_t prot);