Skip to content

Commit 6818b54

Browse files
heicarstVasily Gorbik
authored andcommitted
s390/mm: mark function(s) __always_inline
Always inline asm inlines with variable operands for "i" constraints, since they won't compile if the compiler would decide to not inline them. Reported-by: Michal Kubecek <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 7f032fe commit 6818b54

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

arch/s390/include/asm/pgtable.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -997,9 +997,9 @@ static inline pte_t pte_mkhuge(pte_t pte)
997997
#define IPTE_NODAT 0x400
998998
#define IPTE_GUEST_ASCE 0x800
999999

1000-
static inline void __ptep_ipte(unsigned long address, pte_t *ptep,
1001-
unsigned long opt, unsigned long asce,
1002-
int local)
1000+
static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
1001+
unsigned long opt, unsigned long asce,
1002+
int local)
10031003
{
10041004
unsigned long pto = (unsigned long) ptep;
10051005

@@ -1020,8 +1020,8 @@ static inline void __ptep_ipte(unsigned long address, pte_t *ptep,
10201020
: [r1] "a" (pto), [m4] "i" (local) : "memory");
10211021
}
10221022

1023-
static inline void __ptep_ipte_range(unsigned long address, int nr,
1024-
pte_t *ptep, int local)
1023+
static __always_inline void __ptep_ipte_range(unsigned long address, int nr,
1024+
pte_t *ptep, int local)
10251025
{
10261026
unsigned long pto = (unsigned long) ptep;
10271027

@@ -1436,9 +1436,9 @@ static inline void __pmdp_csp(pmd_t *pmdp)
14361436
#define IDTE_NODAT 0x1000
14371437
#define IDTE_GUEST_ASCE 0x2000
14381438

1439-
static inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
1440-
unsigned long opt, unsigned long asce,
1441-
int local)
1439+
static __always_inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
1440+
unsigned long opt, unsigned long asce,
1441+
int local)
14421442
{
14431443
unsigned long sto;
14441444

@@ -1462,9 +1462,9 @@ static inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
14621462
}
14631463
}
14641464

1465-
static inline void __pudp_idte(unsigned long addr, pud_t *pudp,
1466-
unsigned long opt, unsigned long asce,
1467-
int local)
1465+
static __always_inline void __pudp_idte(unsigned long addr, pud_t *pudp,
1466+
unsigned long opt, unsigned long asce,
1467+
int local)
14681468
{
14691469
unsigned long r3o;
14701470

0 commit comments

Comments
 (0)