Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6553698b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 25e09ca5 e8ad8bc4

arch/x86/boot/string.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)