Message ID | 20210528112127.71738-2-andriy.shevchenko@linux.intel.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
On Fri, 28 May 2021 at 13:21, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Since we don't use structure field layout randomization > the manual shuffling can affect some macros, in particular > container_of() against struct of_mmc_spi, which becomes > a no-op when pdata member is the first one in the structure. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/of_mmc_spi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c > index 9d480a05f655..3629550528b6 100644 > --- a/drivers/mmc/host/of_mmc_spi.c > +++ b/drivers/mmc/host/of_mmc_spi.c > @@ -22,8 +22,8 @@ > MODULE_LICENSE("GPL"); > > struct of_mmc_spi { > - int detect_irq; > struct mmc_spi_platform_data pdata; > + int detect_irq; > }; > > static struct of_mmc_spi *to_of_mmc_spi(struct device *dev) > -- > 2.30.2 >
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c index 9d480a05f655..3629550528b6 100644 --- a/drivers/mmc/host/of_mmc_spi.c +++ b/drivers/mmc/host/of_mmc_spi.c @@ -22,8 +22,8 @@ MODULE_LICENSE("GPL"); struct of_mmc_spi { - int detect_irq; struct mmc_spi_platform_data pdata; + int detect_irq; }; static struct of_mmc_spi *to_of_mmc_spi(struct device *dev)
Since we don't use structure field layout randomization the manual shuffling can affect some macros, in particular container_of() against struct of_mmc_spi, which becomes a no-op when pdata member is the first one in the structure. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mmc/host/of_mmc_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)