Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f78fc874f42f63a460bcebc2aeb98db526280d1c

Authored by Vinay K Nallamothu
Committed by Linus Torvalds
1 parent e49332bd12
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] __attribute__ placement fixes 

The variable attributes "packed" and "align" when used with struct, should
have the following order:

struct ... {...} __attribute__((packed)) var;

This patch fixes few instances where the variable and attributes are placed
the other way around and had no effect.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff

drivers/net/gt96100eth.h
Diff comments   View file @ f78fc87
... ... @@ -214,7 +214,7 @@
214 214 u32 cmdstat;
215 215 u32 next;
216 216 u32 buff_ptr;
217   -} gt96100_td_t __attribute__ ((packed));
  217 +} __attribute__ ((packed)) gt96100_td_t;
218 218  
219 219 typedef struct {
220 220 #ifdef DESC_BE
... ... @@ -227,7 +227,7 @@
227 227 u32 cmdstat;
228 228 u32 next;
229 229 u32 buff_ptr;
230   -} gt96100_rd_t __attribute__ ((packed));
  230 +} __attribute__ ((packed)) gt96100_rd_t;
231 231  
232 232  
233 233 /* Values for the Tx command-status descriptor entry. */
include/asm-m68knommu/MC68328.h
Diff comments   View file @ f78fc87
... ... @@ -993,7 +993,7 @@
993 993 volatile unsigned short int pad1;
994 994 volatile unsigned short int pad2;
995 995 volatile unsigned short int pad3;
996   -} m68328_uart __attribute__((packed));
  996 +} __attribute__((packed)) m68328_uart;
997 997  
998 998  
999 999 /**********
include/asm-m68knommu/MC68EZ328.h
Diff comments   View file @ f78fc87
... ... @@ -815,7 +815,7 @@
815 815 volatile unsigned short int nipr;
816 816 volatile unsigned short int pad1;
817 817 volatile unsigned short int pad2;
818   -} m68328_uart __attribute__((packed));
  818 +} __attribute__((packed)) m68328_uart;
819 819  
820 820  
821 821 /**********
include/asm-m68knommu/MC68VZ328.h
Diff comments   View file @ f78fc87
... ... @@ -909,7 +909,7 @@
909 909 volatile unsigned short int nipr;
910 910 volatile unsigned short int hmark;
911 911 volatile unsigned short int unused;
912   -} m68328_uart __attribute__((packed));
  912 +} __attribute__((packed)) m68328_uart;
913 913  
914 914  
915 915