TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: init: ensure initcall ordering with LTO"

Browse Source 
This reverts commit 9730a6289c.

This is change not sufficient for ThinLTO, it's replaced by
  Iddda881a52b7942781713b188d810b6100159a2b

Bug: 145210207
Change-Id: Ie67f90a19bc78dbf8b61f13dcc441f0f58c60444
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Sami Tolvanen
2019-08-02 12:37:02 -07:00
committed by Alistair Delva
parent a15c6ebb17
commit 8bcac896fa
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/linux/init.h
View File

@@ -167,20 +167,6 @@ extern bool initcall_debug;
#ifndef __ASSEMBLY__
#ifdef CONFIG_LTO_CLANG
/*
* Use __COUNTER__ prefix in the variable to help ensure ordering
* inside a compilation unit that defines multiple initcalls, and
* __LINE__ to help prevent naming collisions.
*/
#define ___initcall_name2(c, l, fn, id) __initcall_##c##_##l##_##fn##id
#define ___initcall_name1(c, l, fn, id) ___initcall_name2(c, l, fn, id)
#define __initcall_name(fn, id) \
___initcall_name1(__COUNTER__, __LINE__, fn, id)
#else
#define __initcall_name(fn, id) __initcall_##fn##id
#endif
/*
* initcalls are now grouped by functionality into separate
* subsections. Ordering inside the subsections is determined
@@ -201,12 +187,12 @@ extern bool initcall_debug;
#define ___define_initcall(fn, id, __sec) \
__ADDRESSABLE(fn) \
asm(".section \"" #__sec ".init\", \"a\" \n" \
__stringify(__initcall_name(fn, id)) ": \n" \
"__initcall_" #fn #id ": \n" \
".long " #fn " - . \n" \
".previous \n");
#else
#define ___define_initcall(fn, id, __sec) \
static initcall_t __initcall_name(fn, id) __used \
static initcall_t __initcall_##fn##id __used \
__attribute__((__section__(#__sec ".init"))) = fn;
#endif