From bc39cf0bc8089af40b2d5ce9b001de77124760ee Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 10 Jun 2014 19:24:50 -0700 Subject: [PATCH] ANDROID: GKI: edac: Fix ABI diffs in edac_device_ctl_info struct Add edac_device_ctl_info struct members causing ABI diffs. This patch skips sysfs changes and ignores the deferrable flag from the original patchset. Bug: 152456530 Test: build and boot Signed-off-by: Stepan Moskovchenko Signed-off-by: Venkata Narendra Kumar Gutta Signed-off-by: Rohit Vaswani [surenb: Squashed the following commits and kept only edac_device_ctl_info struct changes: 117ab600649a edac: Allow panic on correctable errors (CE). 1b9a7044541d edac: Allow the option of creating a deferrable work for polling] Signed-off-by: Suren Baghdasaryan Change-Id: If301dd0134c819167c81004468082a68735d9bd7 Merged-In: If301dd0134c819167c81004468082a68735d9bd7 --- drivers/edac/edac_device.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h index 1aaba74ae411..69dda2c155b2 100644 --- a/drivers/edac/edac_device.h +++ b/drivers/edac/edac_device.h @@ -159,9 +159,11 @@ struct edac_device_ctl_info { /* Per instance controls for this edac_device */ int log_ue; /* boolean for logging UEs */ int log_ce; /* boolean for logging CEs */ + int panic_on_ce; /* boolean for panic'ing on an CE */ int panic_on_ue; /* boolean for panic'ing on an UE */ unsigned poll_msec; /* number of milliseconds to poll interval */ unsigned long delay; /* number of jiffies for poll_msec */ + bool defer_work; /* Create a deferrable work for polling */ /* Additional top controller level attributes, but specified * by the low level driver.