x86/cleanups for v4.13

GIT PULL Ingo Molnar 1 participant 1 message Jul 3, 2017

Subsystems (2)

x86 PARAVIRT_OPS interface

lore

Share & tools

lore

Ingo Molnar

author

2017-07-03 09:03 UTC #0 lore raw

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus

# HEAD: e8ad8bc403f49f8cb95448acfdeee39b459eded4 x86/paravirt: Remove unnecessary return from void function

Two small cleanups.

Thanks,

Ingo

------------------>
Anton Vasilyev (1):
x86/paravirt: Remove unnecessary return from void function

Tommy Nguyen (1):
x86/boot: Add missing strchr() declaration

 arch/x86/boot/string.h          | 1 +
 arch/x86/include/asm/paravirt.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

arch/x86/boot/string.h +1 -0

index 113588ddb43f..f274a50db5fa 100644
@@ -22,6 +22,7 @@ extern int strcmp(const char *str1, const char *str2);
 extern int strncmp(const char *cs, const char *ct, size_t count);
 extern size_t strlen(const char *s);
 extern char *strstr(const char *s1, const char *s2);
+extern char *strchr(const char *s, int c);
 extern size_t strnlen(const char *s, size_t maxlen);
 extern unsigned int atou(const char *s);
 extern unsigned long long simple_strtoull(const char *cp, char **endp,

arch/x86/include/asm/paravirt.h +1 -1

index 55fa56fe4e45..a3dcf8944cb9 100644
@@ -118,7 +118,7 @@ static inline u64 paravirt_read_msr(unsigned msr)
 static inline void paravirt_write_msr(unsigned msr,
 				      unsigned low, unsigned high)
 {
-	return PVOP_VCALL3(pv_cpu_ops.write_msr, msr, low, high);
+	PVOP_VCALL3(pv_cpu_ops.write_msr, msr, low, high);
 }
 
 static inline u64 paravirt_read_msr_safe(unsigned msr, int *err)