From a12132f8488f77795f9500dca4035cc250599efb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 May 2021 08:27:21 +0200 Subject: [PATCH] ANDROID: GKI: restore a part of "struct mmc_host" In commit 17a17bf50612 ("mmc: core: Fix hanging on I/O during system suspend for removable cards") that came in through an LTS update, the struct mmc_host structure lost a field as it was no longer needed. But, of course, the ABI check notices this, so put the field back, even if it is no longer being used, as the ABI should be preserved here. This allows the issue to still be resolved and everything remains working properly. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I4c6ab947a60d01779a26c7544334482748648c4c --- include/linux/mmc/host.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 9b0450d58d70..0c65678ed377 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -286,6 +286,10 @@ struct mmc_host { u32 ocr_avail_sdio; /* SDIO-specific OCR */ u32 ocr_avail_sd; /* SD-specific OCR */ u32 ocr_avail_mmc; /* MMC-specific OCR */ +#ifdef CONFIG_PM_SLEEP + /* DO NOT USE, is not used, for abi preservation only */ + struct notifier_block pm_notify; +#endif struct wakeup_source *ws; /* Enable consume of uevents */ u32 max_current_330; u32 max_current_300;