Skip to content

Commit 4462891

Browse files
author
Fox Snowpatch
committed
1 parent 85ff933 commit 4462891

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

arch/powerpc/include/asm/interrupt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static inline bool is_implicit_soft_masked(struct pt_regs *regs)
106106
return search_kernel_soft_mask_table(regs->nip);
107107
}
108108

109-
static inline void srr_regs_clobbered(void)
109+
static __always_inline void srr_regs_clobbered(void)
110110
{
111111
local_paca->srr_valid = 0;
112112
local_paca->hsrr_valid = 0;

arch/powerpc/include/asm/lv1call.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <linux/types.h>
1616
#include <linux/export.h>
17+
#include <asm/interrupt.h>
1718

1819
/* lv1 call declaration macros */
1920

@@ -208,7 +209,7 @@
208209
#define LV1_CALL(name, in, out, num) \
209210
extern s64 _lv1_##name(LV1_##in##_IN_##out##_OUT_ARG_DECL); \
210211
static inline int lv1_##name(LV1_##in##_IN_##out##_OUT_ARG_DECL) \
211-
{return _lv1_##name(LV1_##in##_IN_##out##_OUT_ARGS);}
212+
{srr_regs_clobbered(); return _lv1_##name(LV1_##in##_IN_##out##_OUT_ARGS);}
212213
#endif
213214

214215
#endif /* !defined(__ASSEMBLER__) */

0 commit comments

Comments
 (0)