From fcaf5d8a6715c9d33d307639fc7804eb97bc8310 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Apr 2023 08:07:02 +0000 Subject: [PATCH] ANDROID: preserve CRC for xhci symbols In release 5.15.107 a new .h file was included in the xhci code, which caused the CRCs to change as some structures changed into "real" structures instead of anonymous definitions. So preserve the CRCs by commenting out the #include if GENKSYMS is being calculated. This will be removed the next KABI break, as it shouldn't be sticking around long. Bug: 161946584 Fixes: 83637720ea20 ("xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu") Signed-off-by: Greg Kroah-Hartman Change-Id: I59838b0af869d3e17fc73d72eb473190c50281fd --- drivers/usb/host/xhci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 1fd2f6a850eb..3ff72f4244a3 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -9,7 +9,9 @@ */ #include +#ifndef __GENKSYMS__ /* ANDROID: KABI CRC preservation hack */ #include +#endif #include #include #include