diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2019-11-13 23:10:52 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-13 23:10:52 +0100 |
| commit | 1566a6a30bf4d85849bab7e389392d6d3de1530e (patch) | |
| tree | bbc979f430cb07d41f7b35524027e25e7a4b9fe6 /arch/arm/include/asm/domain.h | |
| parent | dt-bindings: pinctrl: Convert generic pin mux and config properties to schema (diff) | |
| parent | Linux 5.4-rc5 (diff) | |
| download | linux-dev-1566a6a30bf4d85849bab7e389392d6d3de1530e.tar.xz linux-dev-1566a6a30bf4d85849bab7e389392d6d3de1530e.zip | |
Merge tag 'v5.4-rc5' into devel
Linux 5.4-rc5
Diffstat (limited to 'arch/arm/include/asm/domain.h')
| -rw-r--r-- | arch/arm/include/asm/domain.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index 567dbede4785..f1d0a7807cd0 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -82,7 +82,7 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_CPU_CP15_MMU -static inline unsigned int get_domain(void) +static __always_inline unsigned int get_domain(void) { unsigned int domain; @@ -94,7 +94,7 @@ static inline unsigned int get_domain(void) return domain; } -static inline void set_domain(unsigned val) +static __always_inline void set_domain(unsigned int val) { asm volatile( "mcr p15, 0, %0, c3, c0 @ set domain" @@ -102,12 +102,12 @@ static inline void set_domain(unsigned val) isb(); } #else -static inline unsigned int get_domain(void) +static __always_inline unsigned int get_domain(void) { return 0; } -static inline void set_domain(unsigned val) +static __always_inline void set_domain(unsigned int val) { } #endif |