diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
| commit | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (patch) | |
| tree | b1eb723eb8acd5261336cef1b968311e6332a7b6 /arch/x86 | |
| parent | d98f3af5986fae62bacbe7e83026660d61621a3a (diff) | |
| parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
fs/f2fs/super.c
Pick changes from LTS commit 76517ed2a7fe
("f2fs: sanity check checkpoint segno and blkoff"),
over changes from AOSP commit 0f127e451bc7
("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/boot/string.c | 1 | ||||
| -rw-r--r-- | arch/x86/boot/string.h | 9 | ||||
| -rw-r--r-- | arch/x86/kernel/kvm.c | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index 318b8465d302..06ceddb3a22e 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -14,6 +14,7 @@ #include <linux/types.h> #include "ctype.h" +#include "string.h" int memcmp(const void *s1, const void *s2, size_t len) { diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h index 725e820602b1..113588ddb43f 100644 --- a/arch/x86/boot/string.h +++ b/arch/x86/boot/string.h @@ -18,4 +18,13 @@ int memcmp(const void *s1, const void *s2, size_t len); #define memset(d,c,l) __builtin_memset(d,c,l) #define memcmp __builtin_memcmp +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 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, + unsigned int base); + #endif /* BOOT_STRING_H */ diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index cec49ecf5f31..32187f8a49b4 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -151,6 +151,8 @@ void kvm_async_pf_task_wait(u32 token) if (hlist_unhashed(&n.link)) break; + rcu_irq_exit(); + if (!n.halted) { local_irq_enable(); schedule(); @@ -159,11 +161,11 @@ void kvm_async_pf_task_wait(u32 token) /* * We cannot reschedule. So halt. */ - rcu_irq_exit(); native_safe_halt(); local_irq_disable(); - rcu_irq_enter(); } + + rcu_irq_enter(); } if (!n.halted) finish_wait(&n.wq, &wait); |