The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 533d49b37a2b532354d3841a142173b8321818df
Gitweb: https://git.kernel.org/tip/533d49b37a2b532354d3841a142173b8321818df
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Wed, 20 Nov 2019 15:45:32 +01:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Tue, 10 Dec 2019 10:12:55 +01:00
x86/mm/pat: Clean up <asm/memtype.h> externs
Half of the declarations have an 'extern', half of them not,
use 'extern' consistently.
This makes grepping for APIs easier, such as:
dagon:~/tip> git grep -E '\<memtype_.*\(' arch/x86/ | grep extern
arch/x86/include/asm/memtype.h:extern int memtype_reserve(u64 start, u64 end,
arch/x86/include/asm/memtype.h:extern int memtype_free(u64 start, u64 end);
arch/x86/include/asm/memtype.h:extern int memtype_kernel_map_sync(u64 base, unsigned long size,
arch/x86/include/asm/memtype.h:extern int memtype_reserve_io(resource_size_t start, resource_size_t end,
arch/x86/include/asm/memtype.h:extern void memtype_free_io(resource_size_t start, resource_size_t end);
arch/x86/mm/pat/memtype.h:extern int memtype_check_insert(struct memtype *entry_new,
arch/x86/mm/pat/memtype.h:extern struct memtype *memtype_erase(u64 start, u64 end);
arch/x86/mm/pat/memtype.h:extern struct memtype *memtype_lookup(u64 addr);
arch/x86/mm/pat/memtype.h:extern int memtype_copy_nth_element(struct memtype *entry_out, loff_t pos);
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/include/asm/memtype.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/memtype.h b/arch/x86/include/asm/memtype.h
index ec18e38..9c2447b 100644
--- a/arch/x86/include/asm/memtype.h
+++ b/arch/x86/include/asm/memtype.h
@@ -5,8 +5,8 @@
#include <linux/types.h>
#include <asm/pgtable_types.h>
-bool pat_enabled(void);
-void pat_disable(const char *reason);
+extern bool pat_enabled(void);
+extern void pat_disable(const char *reason);
extern void pat_init(void);
extern void init_cache_modes(void);
@@ -17,11 +17,11 @@ extern int memtype_free(u64 start, u64 end);
extern int memtype_kernel_map_sync(u64 base, unsigned long size,
enum page_cache_mode pcm);
-int memtype_reserve_io(resource_size_t start, resource_size_t end,
+extern int memtype_reserve_io(resource_size_t start, resource_size_t end,
enum page_cache_mode *pcm);
-void memtype_free_io(resource_size_t start, resource_size_t end);
+extern void memtype_free_io(resource_size_t start, resource_size_t end);
-bool pat_pfn_immune_to_uc_mtrr(unsigned long pfn);
+extern bool pat_pfn_immune_to_uc_mtrr(unsigned long pfn);
#endif /* _ASM_X86_MEMTYPE_H */
|