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

Commit ce235d4c authored by Matthias Maennich's avatar Matthias Maennich
Browse files

ANDROID: rebase mainline quilt series on v5.4-rc3 



Change-Id: I917caccc57d47427e423e359837ec94a7ed7be06
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
parent 58d52a4f

patches/ANDROID-Four-part-revert-of-asm-goto-usage-1-4.patch

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Signed-off-by: Ram Muthiah <rammuthiah@google.com> 
 1 file changed, 3 insertions(+), 4 deletions(-)



diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h

index 35c225ede0e4..29920ffb5df1 100644

index 61d93f062a36..176c73385605 100644

--- a/arch/x86/include/asm/uaccess.h

+++ b/arch/x86/include/asm/uaccess.h

@@ -429,11 +429,10 @@ do {									\

patches/ANDROID-Four-part-revert-of-asm-goto-usage-2-4.patch

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Signed-off-by: Ram Muthiah <rammuthiah@google.com> 
 1 file changed, 2 insertions(+), 4 deletions(-)



diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h

index 29920ffb5df1..c647784dd0c4 100644

index 176c73385605..8fc40674c174 100644

--- a/arch/x86/include/asm/uaccess.h

+++ b/arch/x86/include/asm/uaccess.h

@@ -282,7 +282,7 @@ do {									\

patches/ANDROID-Four-part-revert-of-asm-goto-usage-3-4.patch

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Signed-off-by: Ram Muthiah <rammuthiah@google.com> 
 1 file changed, 33 insertions(+), 24 deletions(-)



diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h

index c647784dd0c4..01e410fa97d9 100644

index 8fc40674c174..0b049e6baf31 100644

--- a/arch/x86/include/asm/uaccess.h

+++ b/arch/x86/include/asm/uaccess.h

@@ -184,14 +184,19 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))

patches/ANDROID-Four-part-revert-of-asm-goto-usage-4-4.patch

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Signed-off-by: Ram Muthiah <rammuthiah@google.com> 
 1 file changed, 11 insertions(+), 17 deletions(-)



diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h

index 01e410fa97d9..b498ffae35ca 100644

index 0b049e6baf31..d3b6c3ba61d1 100644

--- a/arch/x86/include/asm/uaccess.h

+++ b/arch/x86/include/asm/uaccess.h

@@ -463,23 +463,17 @@ struct __large_struct { unsigned long buf[100]; };

patches/ANDROID-Kbuild-LLVMLinux-allow-overriding-clang-target-triple.patch

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ Signed-off-by: Alistair Strachan <astrachan@google.com> 
 create mode 100644 scripts/clang-android.sh



diff --git a/Makefile b/Makefile

index 6f54f2f95743..b47f7928d80b 100644

index ffd7a912fc46..dd248a6159ee 100644

--- a/Makefile

+++ b/Makefile

@@ -543,7 +543,11 @@ endif

@@ -526,7 +526,11 @@ endif

 

 ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)

 ifneq ($(CROSS_COMPILE),)