commit e2edeed20bfebd0dbecb4e1e38afaad5e641e080
author Alistair Strachan <astrachan@google.com> Tue Jul 31 21:24:35 2018 -0700
committer Alistair Strachan <astrachan@google.com> Wed Nov 07 23:26:48 2018 +0000
tree 1d0d0c6c90f131c06535c48675ba7a0e9dd3cef9
parent 86a0a4c2dd80d3f6e650ee210756d84e4ce7bb10

Revert "Implement a workaround for clang + PARAVIRT failure."

This reverts commit 805d82cce067183af3dec98b4b04f0824cd1562f.

Problem has been fixed in upstream Linux kernels, 4.4/4.9/4.14 and the
code has been merged via LTS into kernel/common.

Bug: 111396209
Change-Id: I397a3ca34ced1b8528fab6f795144f6d94fb8d7f
Signed-off-by: Alistair Strachan <astrachan@google.com>

net/test/run_net_test.sh

diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index 028ed85..7cb755e 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -228,14 +228,6 @@
     # The CC flag is *not* inherited from the environment, so it must be
     # passed in on the command line.
     make_flags="$make_flags CC=$CC"
-    # TODO: Remove this workaround for https://lkml.org/lkml/2018/5/7/534
-    # Needs a change to clang to be merged, an updated toolchain, and
-    # a new __nostackprotector annotation of the affected PARAVIRT
-    # code in the affected kernel branches (android-4.4, android-4.9,
-    # android-4.14). This sidesteps the issue by disabling PARAVIRT.
-    if [ "$CC" == "clang" ]; then
-      DISABLE_OPTIONS="$DISABLE_OPTIONS PARAVIRT"
-    fi
   fi
 
   # If there's no kernel config at all, create one or UML won't work.