diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 13:42:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 13:42:17 -0700 |
| commit | 6553698be05983056f5561cef6aaee0cc6afe7a0 (patch) | |
| tree | c1cc0611c15786973d2c6c2a06c838d9093cc2c7 /arch | |
| parent | 25e09ca52459586eb6171209635bc8b436a56d79 (diff) | |
| parent | e8ad8bc403f49f8cb95448acfdeee39b459eded4 (diff) | |
| download | linux-6553698be05983056f5561cef6aaee0cc6afe7a0.tar.bz2 | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Two small cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/paravirt: Remove unnecessary return from void function
x86/boot: Add missing strchr() declaration
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/string.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h index 113588ddb43f..f274a50db5fa 100644 --- a/arch/x86/boot/string.h +++ b/arch/x86/boot/string.h @@ -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, diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 55fa56fe4e45..a3dcf8944cb9 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -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) |