projects
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[kernel/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-exynos
/
cpu.h
diff --git
a/arch/arm/include/asm/arch-exynos/cpu.h
b/arch/arm/include/asm/arch-exynos/cpu.h
index
8685c42
..
1ff231b
100644
(file)
--- a/
arch/arm/include/asm/arch-exynos/cpu.h
+++ b/
arch/arm/include/asm/arch-exynos/cpu.h
@@
-177,7
+177,7
@@
static inline char *s5p_get_cpu_name(void)
}
#define IS_SAMSUNG_TYPE(type, id) \
}
#define IS_SAMSUNG_TYPE(type, id) \
-static inline int
cpu_is_##type(void)
\
+static inline int
__attribute__((no_instrument_function)) cpu_is_##type(void)
\
{ \
return (s5p_cpu_id >> 12) == id; \
}
{ \
return (s5p_cpu_id >> 12) == id; \
}
@@
-186,7
+186,8
@@
IS_SAMSUNG_TYPE(exynos4, 0x4)
IS_SAMSUNG_TYPE(exynos5, 0x5)
#define IS_EXYNOS_TYPE(type, id) \
IS_SAMSUNG_TYPE(exynos5, 0x5)
#define IS_EXYNOS_TYPE(type, id) \
-static inline int proid_is_##type(void) \
+static inline int __attribute__((no_instrument_function)) \
+ proid_is_##type(void) \
{ \
return s5p_cpu_id == id; \
}
{ \
return s5p_cpu_id == id; \
}
@@
-196,9
+197,10
@@
IS_EXYNOS_TYPE(exynos4412, 0x4412)
IS_EXYNOS_TYPE(exynos5250, 0x5250)
#define SAMSUNG_BASE(device, base) \
IS_EXYNOS_TYPE(exynos5250, 0x5250)
#define SAMSUNG_BASE(device, base) \
-static inline unsigned int samsung_get_base_##device(void) \
+static inline unsigned int __attribute__((no_instrument_function)) \
+ samsung_get_base_##device(void) \
{ \
{ \
- if (cpu_is_exynos4()) {
\
+ if (cpu_is_exynos4()) { \
if (proid_is_exynos4412()) \
return EXYNOS4X12_##base; \
return EXYNOS4_##base; \
if (proid_is_exynos4412()) \
return EXYNOS4X12_##base; \
return EXYNOS4_##base; \