x86/mm: Fix -Wmissing-prototypes warning in init.c
PATCH 1/1 x86/mm: Fix -Wmissing-prototypes warning in init.c
Fix -Wmissing-prototypes warning by including the respective header containing prototypes:
arch/x86/mm/init.c:81:6:
warning: no previous prototype for ‘x86_has_pat_wp’ [-Wmissing-prototypes] bool x86_has_pat_wp(void)
arch/x86/mm/init.c:86:22:
warning: no previous prototype for ‘pgprot2cachemode’ [-Wmissing-prototypes] enum page_cache_mode pgprot2cachemode(pgprot_t pgprot)
Fix:
arch/x86/mm/init.c:893:13:
warning: no previous prototype for ‘mem_encrypt_free_decrypted_mem’ [-Wmissing-prototypes] void __weak mem_encrypt_free_decrypted_mem(void) { }
by making it static inline for the !CONFIG_AMD_MEM_ENCRYPT case.
This warning happens when CONFIG_AMD_MEM_ENCRYPT is not enabled (defconfig for example):
./arch/x86/include/asm/mem_encrypt.h:80:27:
warning: inline function ‘mem_encrypt_free_decrypted_mem’ declared weak [-Wattributes] static inline void __weak mem_encrypt_free_decrypted_mem(void) { }
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It's ok to convert to static inline because the function is only use in x86. Is not shared with other architectures so that it is not necessary to be __weak.
--- arch/x86/include/asm/mem_encrypt.h | 2 ++ arch/x86/mm/init.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/mem_encrypt.h +2 -0
@@ -77,6 +77,8 @@ early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0;static inline int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size) {return 0 ; } +static inline void mem_encrypt_free_decrypted_mem (void ) { } +#define __bss_decrypted#endif /* CONFIG_AMD_MEM_ENCRYPT */
arch/x86/mm/init.c +1 -2
@@ -25,6 +25,7 @@#include <asm/cpufeature.h> #include <asm/pti.h> #include <asm/text-patching.h> +#include <asm/memtype.h> /* * We need to define the tracepoints somewhere, and tlb.c
@@ -890,8 +891,6 @@ void free_kernel_image_pages(const char *what, void *begin, void *end)set_memory_np_noalias (begin_ul, len_pages); } -void __weak mem_encrypt_free_decrypted_mem (void ) { } -void __ref free_initmem (void ) {e820__reallocate_tables ();
Signature · 1 line
2.20.1
[tip: x86/cleanups] x86/mm: Fix -Wmissing-prototypes warnings for arch/x86/mm/init.c
The following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: d5249bc7a1a8869da90ba668b331b0b3f8996924 Gitweb: https://git.kernel.org/tip/d5249bc7a1a8869da90ba668b331b0b3f8996924 Author: Benjamin Thiel <[email protected]> AuthorDate: Sat, 06 Jun 2020 14:26:29 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 17 Jun 2020 10:45:46 +02:00
x86/mm: Fix -Wmissing-prototypes warnings for arch/x86/mm/init.c
Fix -Wmissing-prototypes warnings:
arch/x86/mm/init.c:81:6:
warning: no previous prototype for ‘x86_has_pat_wp’ [-Wmissing-prototypes] bool x86_has_pat_wp(void)
arch/x86/mm/init.c:86:22:
warning: no previous prototype for ‘pgprot2cachemode’ [-Wmissing-prototypes] enum page_cache_mode pgprot2cachemode(pgprot_t pgprot)
by including the respective header containing prototypes. Also fix:
arch/x86/mm/init.c:893:13:
warning: no previous prototype for ‘mem_encrypt_free_decrypted_mem’ [-Wmissing-prototypes] void __weak mem_encrypt_free_decrypted_mem(void) { }
by making it static inline for the !CONFIG_AMD_MEM_ENCRYPT case. This warning happens when CONFIG_AMD_MEM_ENCRYPT is not enabled (defconfig for example):
./arch/x86/include/asm/mem_encrypt.h:80:27:
warning: inline function ‘mem_encrypt_free_decrypted_mem’ declared weak [-Wattributes] static inline void __weak mem_encrypt_free_decrypted_mem(void) { }
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It's ok to convert to static inline because the function is used only in x86. Is not shared with other architectures so drop the __weak too.
[ bp: Massage and adjust __weak comments while at it. ]
--- arch/x86/include/asm/mem_encrypt.h | 5 ++++- arch/x86/mm/init.c | 3 +-- arch/x86/mm/mem_encrypt.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/include/asm/mem_encrypt.h +4 -1
@@ -43,9 +43,10 @@ void __init sme_enable(struct boot_params *bp);int __init early_set_memory_decrypted (unsigned long vaddr,unsigned long size);int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size); +void __init mem_encrypt_free_decrypted_mem (void ); +/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ); -void __init mem_encrypt_free_decrypted_mem (void );bool sme_active (void );bool sev_active (void );
@@ -77,6 +78,8 @@ early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0;static inline int __init early_set_memory_encrypted (unsigned long vaddr,unsigned long size) {return 0 ; } +static inline void mem_encrypt_free_decrypted_mem (void ) { } +#define __bss_decrypted#endif /* CONFIG_AMD_MEM_ENCRYPT */
arch/x86/mm/init.c +1 -2
@@ -25,6 +25,7 @@#include <asm/cpufeature.h> #include <asm/pti.h> #include <asm/text-patching.h> +#include <asm/memtype.h> /* * We need to define the tracepoints somewhere, and tlb.c
@@ -912,8 +913,6 @@ void free_kernel_image_pages(const char *what, void *begin, void *end)set_memory_np_noalias (begin_ul, len_pages); } -void __weak mem_encrypt_free_decrypted_mem (void ) { } -void __ref free_initmem (void ) {e820__reallocate_tables ();
arch/x86/mm/mem_encrypt.c +1 -1
@@ -376,7 +376,6 @@ bool force_dma_unencrypted(struct device *dev)return false; } -/* Architecture __weak replacement functions */ void __init mem_encrypt_free_decrypted_mem (void ) {unsigned long vaddr, vaddr_end, npages;
@@ -401,6 +400,7 @@ void __init mem_encrypt_free_decrypted_mem(void)free_init_pages ("unused decrypted" , vaddr, vaddr_end); } +/* Architecture __weak replacement functions */ void __init mem_encrypt_init (void ) {if (!sme_me_mask)