summaryrefslogtreecommitdiffstats
path: root/lib/physmem.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-27 14:06:11 -0400
committerTom Rini <trini@konsulko.com>2016-04-01 17:17:43 -0400
commit65b3c6bbae072367cbcf07bdd2ec27dcd591c0b3 (patch)
treed40e00f48444f233d641d6774916a1e0af47cff0 /lib/physmem.c
parent5735bca5f677a5aeb61364a6491080c6bb2ebc0e (diff)
downloadtalos-obmc-uboot-65b3c6bbae072367cbcf07bdd2ec27dcd591c0b3.tar.gz
talos-obmc-uboot-65b3c6bbae072367cbcf07bdd2ec27dcd591c0b3.zip
lib/physmem.c: Switch to __weak for arch_phys_memset
We normally use __weak rather than calling it out directly as an alias. Update this function to the normal method. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/physmem.c')
-rw-r--r--lib/physmem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/physmem.c b/lib/physmem.c
index 0f035edcbe..f21ac243ed 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -10,8 +10,9 @@
#include <common.h>
#include <physmem.h>
+#include <linux/compiler.h>
-static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
+phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
{
void *s_ptr = (void *)(uintptr_t)s;
@@ -19,6 +20,3 @@ static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
assert(((phys_addr_t)(uintptr_t)(s + n)) == s + n);
return (phys_addr_t)(uintptr_t)memset(s_ptr, c, n);
}
-
-phys_addr_t arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
- __attribute__((weak, alias("__arch_phys_memset")));
OpenPOWER on IntegriCloud