Skip to content

Commit 46938cc

Browse files
author
Ingo Molnar
committed
x86/paravirt: Rename paravirt_patch_site::instrtype to paravirt_patch_site::type
It's used as 'type' in almost every paravirt patching function, so standardize the field name from the somewhat weird 'instrtype' name to 'type'. Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent 1fc654c commit 46938cc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

arch/x86/include/asm/paravirt_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@ u64 _paravirt_ident_64(u64);
672672

673673
/* These all sit in the .parainstructions section to tell us what to patch. */
674674
struct paravirt_patch_site {
675-
u8 *instr; /* original instructions */
676-
u8 instrtype; /* type of this instruction */
675+
u8 *instr; /* original instructions */
676+
u8 type; /* type of this instruction */
677677
u8 len; /* length of original instruction */
678678
};
679679

arch/x86/kernel/alternative.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
599599
BUG_ON(p->len > MAX_PATCH_LEN);
600600
/* prep the buffer with the original instructions */
601601
memcpy(insn_buff, p->instr, p->len);
602-
used = pv_ops.init.patch(p->instrtype, insn_buff,
603-
(unsigned long)p->instr, p->len);
602+
used = pv_ops.init.patch(p->type, insn_buff, (unsigned long)p->instr, p->len);
604603

605604
BUG_ON(used > p->len);
606605

0 commit comments

Comments
 (0)