diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-20 00:03:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-20 00:03:37 +0200 |
| commit | 95ab29a1f1c41fb958ff67926cc0c8e08c89d38e (patch) | |
| tree | 95ba9d0c5fa04f42345751bef4f413affc7077d5 /arch/arm/include | |
| parent | 1c90e170fef7df71f09be837e65641cf5c687dce (diff) | |
| parent | dd34b115666a1ccc69e3af52cc92c7410490f4fd (diff) | |
| download | linux-0-day-95ab29a1f1c41fb958ff67926cc0c8e08c89d38e.tar.gz linux-0-day-95ab29a1f1c41fb958ff67926cc0c8e08c89d38e.tar.xz | |
Merge tag 'uniphier-soc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/soc
Pull "UniPhier ARM SoC updates for v4.9" from Masahiro Yamada:
* Remove unneeded SMP code
* tag 'uniphier-soc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
ARM: uniphier: remove SoC-specific SMP code
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/hardware/cache-uniphier.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/include/asm/hardware/cache-uniphier.h b/arch/arm/include/asm/hardware/cache-uniphier.h index 102e3fbe1e10e..eaa60da7dac31 100644 --- a/arch/arm/include/asm/hardware/cache-uniphier.h +++ b/arch/arm/include/asm/hardware/cache-uniphier.h @@ -1,5 +1,6 @@ /* - * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,28 +20,11 @@ #ifdef CONFIG_CACHE_UNIPHIER int uniphier_cache_init(void); -int uniphier_cache_l2_is_enabled(void); -void uniphier_cache_l2_touch_range(unsigned long start, unsigned long end); -void uniphier_cache_l2_set_locked_ways(u32 way_mask); #else static inline int uniphier_cache_init(void) { return -ENODEV; } - -static inline int uniphier_cache_l2_is_enabled(void) -{ - return 0; -} - -static inline void uniphier_cache_l2_touch_range(unsigned long start, - unsigned long end) -{ -} - -static inline void uniphier_cache_l2_set_locked_ways(u32 way_mask) -{ -} #endif #endif /* __CACHE_UNIPHIER_H */ |