From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 15 Jul 2009 18:07:45 +0000 (-0700)
Subject: Staging: hv: remove STRUCT_PACKED and STRUCT_ALIGNED defines
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b211a955d4f48c855c5341e00d27b4b61b96c1f6;p=openwrt%2Fstaging%2Fblogic.git

Staging: hv: remove STRUCT_PACKED and STRUCT_ALIGNED defines

Use the correct __attribute__((packed)) one if it's really needed.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h
index c5ecf41a00e6..ba2d8a9455e0 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 fa0ae8cc08c9..5bb72bc71bb6 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) )