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

Commit 52f5684c authored by Gideon Israel Dsouza's avatar Gideon Israel Dsouza Committed by Linus Torvalds
Browse files

kernel: use macros from compiler.h instead of __attribute__((...)) 



To increase compiler portability there is <linux/compiler.h> which
provides convenience macros for various gcc constructs.  Eg: __weak for
__attribute__((weak)).  I've replaced all instances of gcc attributes
with the right macro in the kernel subsystem.

Signed-off-by: default avatarGideon Israel Dsouza <gidisrael@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce816fa8

kernel/fork.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include <linux/signalfd.h>

#include <linux/signalfd.h>

#include <linux/uprobes.h>

#include <linux/uprobes.h>

#include <linux/aio.h>

#include <linux/aio.h>

#include <linux/compiler.h>





#include <asm/pgtable.h>

#include <asm/pgtable.h>

#include <asm/pgalloc.h>

#include <asm/pgalloc.h>
@@ -286,7 +287,7 @@ void __init fork_init(unsigned long mempages) 
		init_task.signal->rlim[RLIMIT_NPROC];

		init_task.signal->rlim[RLIMIT_NPROC];

}

}





int __attribute__((weak)) arch_dup_task_struct(struct task_struct *dst,

int __weak arch_dup_task_struct(struct task_struct *dst,

					       struct task_struct *src)

					       struct task_struct *src)

{

{

	*dst = *src;

	*dst = *src;

kernel/kallsyms.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/ctype.h>

#include <linux/ctype.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/compiler.h>





#include <asm/sections.h>

#include <asm/sections.h>
@@ -36,8 +37,8 @@ 
 * These will be re-linked against their real values

 * These will be re-linked against their real values

 * during the second link stage.

 * during the second link stage.

 */

 */

extern const unsigned long kallsyms_addresses[] __attribute__((weak));

extern const unsigned long kallsyms_addresses[] __weak;

extern const u8 kallsyms_names[] __attribute__((weak));

extern const u8 kallsyms_names[] __weak;





/*

/*

 * Tell the compiler that the count isn't in the small data section if the arch

 * Tell the compiler that the count isn't in the small data section if the arch
@@ -46,10 +47,10 @@ extern const u8 kallsyms_names[] __attribute__((weak)); 
extern const unsigned long kallsyms_num_syms

extern const unsigned long kallsyms_num_syms

__attribute__((weak, section(".rodata")));

__attribute__((weak, section(".rodata")));





extern const u8 kallsyms_token_table[] __attribute__((weak));

extern const u8 kallsyms_token_table[] __weak;

extern const u16 kallsyms_token_index[] __attribute__((weak));

extern const u16 kallsyms_token_index[] __weak;





extern const unsigned long kallsyms_markers[] __attribute__((weak));

extern const unsigned long kallsyms_markers[] __weak;





static inline int is_kernel_inittext(unsigned long addr)

static inline int is_kernel_inittext(unsigned long addr)

{

{

kernel/kexec.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

#include <linux/swap.h>

#include <linux/swap.h>

#include <linux/syscore_ops.h>

#include <linux/syscore_ops.h>

#include <linux/compiler.h>





#include <asm/page.h>

#include <asm/page.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>
@@ -1551,10 +1552,10 @@ void vmcoreinfo_append_str(const char *fmt, ...) 
 * provide an empty default implementation here -- architecture

 * provide an empty default implementation here -- architecture

 * code may override this

 * code may override this

 */

 */

void __attribute__ ((weak)) arch_crash_save_vmcoreinfo(void)

void __weak arch_crash_save_vmcoreinfo(void)

{}

{}





unsigned long __attribute__ ((weak)) paddr_vmcoreinfo_note(void)

unsigned long __weak paddr_vmcoreinfo_note(void)

{

{

	return __pa((unsigned long)(char *)&vmcoreinfo_note);

	return __pa((unsigned long)(char *)&vmcoreinfo_note);

}

}

kernel/ksysfs.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/stat.h>

#include <linux/stat.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/capability.h>

#include <linux/capability.h>

#include <linux/compiler.h>





#include <linux/rcupdate.h>	/* rcu_expedited */

#include <linux/rcupdate.h>	/* rcu_expedited */
@@ -162,8 +163,8 @@ KERNEL_ATTR_RW(rcu_expedited); 
/*

/*

 * Make /sys/kernel/notes give the raw contents of our kernel .notes section.

 * Make /sys/kernel/notes give the raw contents of our kernel .notes section.

 */

 */

extern const void __start_notes __attribute__((weak));

extern const void __start_notes __weak;

extern const void __stop_notes __attribute__((weak));

extern const void __stop_notes __weak;

#define	notes_size (&__stop_notes - &__start_notes)

#define	notes_size (&__stop_notes - &__start_notes)





static ssize_t notes_read(struct file *filp, struct kobject *kobj,

static ssize_t notes_read(struct file *filp, struct kobject *kobj,

kernel/power/power.h

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

#include <linux/suspend_ioctls.h>

#include <linux/utsname.h>

#include <linux/utsname.h>

#include <linux/freezer.h>

#include <linux/freezer.h>

#include <linux/compiler.h>





struct swsusp_info {

struct swsusp_info {

	struct new_utsname	uts;

	struct new_utsname	uts;
@@ -11,7 +12,7 @@ struct swsusp_info { 
	unsigned long		image_pages;

	unsigned long		image_pages;

	unsigned long		pages;

	unsigned long		pages;

	unsigned long		size;

	unsigned long		size;

} __attribute__((aligned(PAGE_SIZE)));

} __aligned(PAGE_SIZE);





#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATION

/* kernel/power/snapshot.c */

/* kernel/power/snapshot.c */