mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
|
From da5e08dd912acdf8b7d69b4396ab57c0f52a1576 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Behan Webster <behanw@converseincode.com>
|
||
|
|
Date: Tue, 3 Sep 2013 22:27:26 -0400
|
||
|
|
Subject: [PATCH 2/2] ARM: LLVMLinux: Change "extern inline" to "static inline"
|
||
|
|
in glue-cache.h
|
||
|
|
|
||
|
|
With compilers which follow the C99 standard (like modern versions of gcc and
|
||
|
|
clang), "extern inline" does the wrong thing (emits code for an externally
|
||
|
|
linkable version of the inline function). "static inline" is the correct choice
|
||
|
|
instead.
|
||
|
|
|
||
|
|
Author: Behan Webster <behanw@converseincode.com>
|
||
|
|
Signed-off-by: Behan Webster <behanw@converseincode.com>
|
||
|
|
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
|
||
|
|
---
|
||
|
|
arch/arm/include/asm/glue-cache.h | 22 +++++++++++-----------
|
||
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
|
||
|
|
index c81adc0..a3c24cd 100644
|
||
|
|
--- a/arch/arm/include/asm/glue-cache.h
|
||
|
|
+++ b/arch/arm/include/asm/glue-cache.h
|
||
|
|
@@ -130,22 +130,22 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef __ASSEMBLER__
|
||
|
|
-extern inline void nop_flush_icache_all(void) { }
|
||
|
|
-extern inline void nop_flush_kern_cache_all(void) { }
|
||
|
|
-extern inline void nop_flush_kern_cache_louis(void) { }
|
||
|
|
-extern inline void nop_flush_user_cache_all(void) { }
|
||
|
|
-extern inline void nop_flush_user_cache_range(unsigned long a,
|
||
|
|
+static inline void nop_flush_icache_all(void) { }
|
||
|
|
+static inline void nop_flush_kern_cache_all(void) { }
|
||
|
|
+static inline void nop_flush_kern_cache_louis(void) { }
|
||
|
|
+static inline void nop_flush_user_cache_all(void) { }
|
||
|
|
+static inline void nop_flush_user_cache_range(unsigned long a,
|
||
|
|
unsigned long b, unsigned int c) { }
|
||
|
|
|
||
|
|
-extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
|
||
|
|
-extern inline int nop_coherent_user_range(unsigned long a,
|
||
|
|
+static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }
|
||
|
|
+static inline int nop_coherent_user_range(unsigned long a,
|
||
|
|
unsigned long b) { return 0; }
|
||
|
|
-extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
|
||
|
|
+static inline void nop_flush_kern_dcache_area(void *a, size_t s) { }
|
||
|
|
|
||
|
|
-extern inline void nop_dma_flush_range(const void *a, const void *b) { }
|
||
|
|
+static inline void nop_dma_flush_range(const void *a, const void *b) { }
|
||
|
|
|
||
|
|
-extern inline void nop_dma_map_area(const void *s, size_t l, int f) { }
|
||
|
|
-extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
|
||
|
|
+static inline void nop_dma_map_area(const void *s, size_t l, int f) { }
|
||
|
|
+static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef MULTI_CACHE
|
||
|
|
--
|
||
|
|
2.4.4
|
||
|
|
|