diff options
author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-01-14 18:39:45 -0800 |
---|---|---|
committer | Robin Peng <robinpeng@google.com> | 2024-01-15 04:19:04 +0000 |
commit | 743786674ea8ea9c5121ff3d33e60cdcead4a9a8 (patch) | |
tree | 37c9307c8dab86b88eca05bc94e05a2849c729cd | |
parent | a94bf889ae704d37a905bd0c5fec9f0962c55831 (diff) | |
parent | d9bc66d91be9a2956e86be4f93aa5adf76549820 (diff) | |
download | aoc-743786674ea8ea9c5121ff3d33e60cdcead4a9a8.tar.gz |
Merge android14-gs-pixel-5.15-udc-d2 into android14-gs-pixel-5.15-24Q2
SBMerger: 571992243
Change-Id: I807c71bdeabfa8679835773c7abb7f87d126fe9f
-rw-r--r-- | aoc.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1820,7 +1820,6 @@ static void aoc_watchdog(struct work_struct *work) sscd_info.segs[0].addr = prvdata->dram_virt; } - if (ap_reset) { /* Prefer the user specified reason */ scnprintf(crash_info, sizeof(crash_info), "AP Reset: %s", prvdata->ap_reset_reason); |