mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-26 12:30:23 +09:00
ANDROID: fix up gpio change in 5.10.111
Commit7e88a50704("gpio: Restrict usage of GPIO chip irq members before initialization") causes an abi break, so use one of our reserved fields to handle the change properly. This causes the .xml file to need to be updated as libabigail notices that the structure has changed a bit, but this is to be expected: Leaf changes summary: 0 artifact changed (2 filtered out) Changed leaf types summary: 0 (2 filtered out) leaf types changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable type 'struct gpio_irq_chip' changed member 'union { bool initialized; struct { u64 android_kabi_reserved1; }; union { }; }' was added member 'u64 android_kabi_reserved1' was removed Bug: 161946584 Fixes:7e88a50704("gpio: Restrict usage of GPIO chip irq members before initialization") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I010117f847936389e3a3d21d1119b52ee35005fd
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -225,15 +225,6 @@ struct gpio_irq_chip {
|
||||
unsigned long *valid_mask,
|
||||
unsigned int ngpios);
|
||||
|
||||
/**
|
||||
* @initialized:
|
||||
*
|
||||
* Flag to track GPIO chip irq member's initialization.
|
||||
* This flag will make sure GPIO chip irq members are not used
|
||||
* before they are initialized.
|
||||
*/
|
||||
bool initialized;
|
||||
|
||||
/**
|
||||
* @valid_mask:
|
||||
*
|
||||
@@ -277,7 +268,14 @@ struct gpio_irq_chip {
|
||||
*/
|
||||
void (*irq_mask)(struct irq_data *data);
|
||||
|
||||
ANDROID_KABI_RESERVE(1);
|
||||
/**
|
||||
* @initialized:
|
||||
*
|
||||
* Flag to track GPIO chip irq member's initialization.
|
||||
* This flag will make sure GPIO chip irq members are not used
|
||||
* before they are initialized.
|
||||
*/
|
||||
ANDROID_KABI_USE(1, bool initialized);
|
||||
ANDROID_KABI_RESERVE(2);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user