diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
| commit | a976c2951d8f376112361830aa7762beff83a205 (patch) | |
| tree | 24f6647aedd4b570cb67f3195962f5c8a040c824 /include/linux/init.h | |
| parent | 83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff) | |
| parent | 16b9951f656ea8f2b47546bd898325a7e256932f (diff) | |
| download | lwn-a976c2951d8f376112361830aa7762beff83a205.tar.gz lwn-a976c2951d8f376112361830aa7762beff83a205.zip | |
Merge back ACPICA material for v4.13.
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 79af0962fd52..94769d687cf0 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -39,7 +39,7 @@ /* These are for everybody (although not all archs will actually discard it in modules) */ -#define __init __section(.init.text) __cold notrace __latent_entropy +#define __init __section(.init.text) __cold __inittrace __latent_entropy #define __initdata __section(.init.data) #define __initconst __section(.init.rodata) #define __exitdata __section(.exit.data) @@ -68,8 +68,10 @@ #ifdef MODULE #define __exitused +#define __inittrace notrace #else #define __exitused __used +#define __inittrace #endif #define __exit __section(.exit.text) __exitused __cold notrace |