sched, vmlinux.lds: Increase STRUCT_ALIGNMENT to 64 bytes for GCC-4.9 (85c2ce91) · Commits · 戴 / test

include/asm-generic/vmlinux.lds.h

+11 −7

Original line number	Diff line number	Diff line
		@@ -108,6 +108,17 @@
		#define SBSS_MAIN .sbss
		#endif

		/*
		* GCC 4.5 and later have a 32 bytes section alignment for structures.
		* Except GCC 4.9, that feels the need to align on 64 bytes.
		*/
		#if __GNUC__ == 4 && __GNUC_MINOR__ == 9
		#define STRUCT_ALIGNMENT 64
		#else
		#define STRUCT_ALIGNMENT 32
		#endif
		#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT)

		/*
		* The order of the sched class addresses are important, as they are
		* used to determine the order of the priority of each sched class in
		@@ -123,13 +134,6 @@
		*(__stop_sched_class) \
		__end_sched_classes = .;

		/*
		* Align to a 32 byte boundary equal to the
		* alignment gcc 4.5 uses for a struct
		*/
		#define STRUCT_ALIGNMENT 32
		#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT)

		/* The actual configuration determine if the init/exit sections
		* are handled as text/data or they can be discarded (which
		* often happens at runtime)

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@
		#include <linux/tsacct_kern.h>

		#include <asm/tlb.h>
		#include <asm-generic/vmlinux.lds.h>

		#ifdef CONFIG_PARAVIRT
		# include <asm/paravirt.h>
		@@ -1810,7 +1811,7 @@ struct sched_class {
		#ifdef CONFIG_FAIR_GROUP_SCHED
		void (task_change_group)(struct task_struct p, int type);
		#endif
		} __aligned(32); /* STRUCT_ALIGN(), vmlinux.lds.h */
		} __aligned(STRUCT_ALIGNMENT); /* STRUCT_ALIGN(), vmlinux.lds.h */

		static inline void put_prev_task(struct rq rq, struct task_struct prev)
		{