Skip to content

Commit efc344c

Browse files
masahir0ytorvalds
authored andcommitted
powerpc/mm/radix: mark as __tlbie_pid() and friends as__always_inline
This prepares to move CONFIG_OPTIMIZE_INLINING from x86 to a common place. We need to eliminate potential issues beforehand. If it is enabled for powerpc, the following errors are reported: arch/powerpc/mm/tlb-radix.c: In function '__tlbie_lpid': arch/powerpc/mm/tlb-radix.c:148:2: warning: asm operand 3 probably doesn't match constraints asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) ^~~ arch/powerpc/mm/tlb-radix.c:148:2: error: impossible constraint in 'asm' arch/powerpc/mm/tlb-radix.c: In function '__tlbie_pid': arch/powerpc/mm/tlb-radix.c:118:2: warning: asm operand 3 probably doesn't match constraints asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) ^~~ arch/powerpc/mm/tlb-radix.c: In function '__tlbiel_pid': arch/powerpc/mm/tlb-radix.c:104:2: warning: asm operand 3 probably doesn't match constraints asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1) ^~~ Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Masahiro Yamada <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Boris Brezillon <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Norris <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Marek Vasut <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Mathieu Malaterre <[email protected]> Cc: Miquel Raynal <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Russell King <[email protected]> Cc: Stefan Agner <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e12d6d7 commit efc344c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/powerpc/mm/book3s64/radix_tlb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void radix__tlbiel_all(unsigned int action)
9090
asm volatile(PPC_INVALIDATE_ERAT "; isync" : : :"memory");
9191
}
9292

93-
static inline void __tlbiel_pid(unsigned long pid, int set,
93+
static __always_inline void __tlbiel_pid(unsigned long pid, int set,
9494
unsigned long ric)
9595
{
9696
unsigned long rb,rs,prs,r;
@@ -106,7 +106,7 @@ static inline void __tlbiel_pid(unsigned long pid, int set,
106106
trace_tlbie(0, 1, rb, rs, ric, prs, r);
107107
}
108108

109-
static inline void __tlbie_pid(unsigned long pid, unsigned long ric)
109+
static __always_inline void __tlbie_pid(unsigned long pid, unsigned long ric)
110110
{
111111
unsigned long rb,rs,prs,r;
112112

@@ -120,7 +120,7 @@ static inline void __tlbie_pid(unsigned long pid, unsigned long ric)
120120
trace_tlbie(0, 0, rb, rs, ric, prs, r);
121121
}
122122

123-
static inline void __tlbiel_lpid(unsigned long lpid, int set,
123+
static __always_inline void __tlbiel_lpid(unsigned long lpid, int set,
124124
unsigned long ric)
125125
{
126126
unsigned long rb,rs,prs,r;
@@ -136,7 +136,7 @@ static inline void __tlbiel_lpid(unsigned long lpid, int set,
136136
trace_tlbie(lpid, 1, rb, rs, ric, prs, r);
137137
}
138138

139-
static inline void __tlbie_lpid(unsigned long lpid, unsigned long ric)
139+
static __always_inline void __tlbie_lpid(unsigned long lpid, unsigned long ric)
140140
{
141141
unsigned long rb,rs,prs,r;
142142

0 commit comments

Comments
 (0)