diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-30 15:58:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-30 15:58:39 +0000 |
| commit | c39ecb42c26741f1f4847963c3fb1c6c431c705b (patch) | |
| tree | e45e25d0a858fa2781a694e2a9014e0e20563c29 | |
| parent | 51ede9026a77e9a4fd6591122177baf8a661f471 (diff) | |
| parent | 3daa1e113e862a025b568d0ebba1b2cefba1ddc8 (diff) | |
| download | cuttlefish-modules-android-5.4.tar.gz | |
Merge changes Ic34262a0,I1dfc16cf,Ib42ae56a into android-5.4deprecated/android-5.4android-5.4
* changes:
Disable BPF_JIT_ALWAYS_ON on 32-bit x86
Disable TEST_STACKINIT on 32-bit x86
Remove open-coded 64-bit divide
| -rw-r--r-- | i686.fragment | 3 | ||||
| -rw-r--r-- | wlan_simulation/virt_wifi_simulation.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/i686.fragment b/i686.fragment index 7ee0c90..f269de8 100644 --- a/i686.fragment +++ b/i686.fragment @@ -1 +1,4 @@ CONFIG_MCORE2=y +# b/154934534 +# CONFIG_TEST_STACKINIT is not set +# CONFIG_BPF_JIT_ALWAYS_ON is not set diff --git a/wlan_simulation/virt_wifi_simulation.c b/wlan_simulation/virt_wifi_simulation.c index 42b8b50..171b403 100644 --- a/wlan_simulation/virt_wifi_simulation.c +++ b/wlan_simulation/virt_wifi_simulation.c @@ -122,8 +122,8 @@ error: static int select_scan_config(void) { int index; - u64 delta_time = (current_scan_trigger_time - wifi_enable_tsf) / - 1000000000; + u64 delta_time = div_u64(current_scan_trigger_time - wifi_enable_tsf, + 1000000000); for (index = last_scan_config_index; index < total_configured_scan_result; index++) { |