From: Greg Kroah-Hartman Date: Wed, 15 Jul 2009 18:07:45 +0000 (-0700) Subject: Staging: hv: remove STRUCT_PACKED and STRUCT_ALIGNED defines X-Git-Tag: v2.6.32-rc1~668^2~460 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b211a955d4f48c855c5341e00d27b4b61b96c1f6;p=~emulex%2Finfiniband.git Staging: hv: remove STRUCT_PACKED and STRUCT_ALIGNED defines Use the correct __attribute__((packed)) one if it's really needed. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h index c5ecf41a00e..ba2d8a9455e 100644 --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h @@ -43,7 +43,7 @@ typedef struct _RING_BUFFER { // volatile u32 InterruptMask; // Ring data starts here + RingDataStartOffset !!! DO NOT place any fields below this !!! u8 Buffer[0]; -} STRUCT_PACKED RING_BUFFER; +} __attribute__((packed)) RING_BUFFER; typedef struct _RING_BUFFER_INFO { RING_BUFFER* RingBuffer; diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index fa0ae8cc08c..5bb72bc71bb 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -30,9 +30,6 @@ // -#define STRUCT_PACKED __attribute__((__packed__)) -#define STRUCT_ALIGNED(x) __attribute__((__aligned__(x))) - #define UNUSED_VAR(v) v __attribute__((__unused__)) #define ALIGN_UP(value, align) ( ((value) & (align-1))? ( ((value) + (align-1)) & ~(align-1) ): (value) )