From 12b2e11967b6e9cfc5ab30344dee34e8efe06ede Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Fri, 11 Aug 2017 18:10:25 +0530 Subject: [PATCH] LSK-ANDROID: arm64: Fix the merge commit and allmodconfig build. LSK merge commit 212055772257 ("Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android") broke allmodconfig build. This patch fix the merge commit and allmodconfig build. Fixes: 212055772257 ("Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android") Signed-off-by: Amit Pundir --- arch/arm64/kernel/armv8_deprecated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c index 373a80e9ed67..10d3642deb7c 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -301,7 +301,7 @@ do { \ : "=&r" (res), "+r" (data), "=&r" (temp) \ : "r" ((unsigned long)addr), "i" (-EAGAIN), \ "i" (-EFAULT) \ - : "memory") + : "memory"); \ uaccess_disable(); \ } while (0)