From 60b82eb5cdfeea33cddc7740a3eb30d41d4192a4 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Mon, 2 May 2005 16:21:52 +0000
Subject: [PATCH] Moved definition of __shared into compiler.h

---
 src/drivers/net/sundance.c |  1 -
 src/drivers/net/tg3.c      |  1 -
 src/include/compiler.h     | 17 +++++++++++++++++
 src/include/shared.h       | 21 ---------------------
 4 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 src/include/shared.h

diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 6fc3208e..05621d4f 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -48,7 +48,6 @@
 #include "pci.h"
 #include "timer.h"
 #include "mii.h"
-#include "shared.h"
 
 #define drv_version "v1.12"
 #define drv_date "2004-03-21"
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index b420a64b..2d881f08 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -16,7 +16,6 @@
 #include "pci.h"
 #include "timer.h"
 #include "string.h"
-#include "shared.h"
 #include "tg3.h"
 
 #define SUPPORT_COPPER_PHY  1
diff --git a/src/include/compiler.h b/src/include/compiler.h
index 4fe4f025..df0a01a6 100644
--- a/src/include/compiler.h
+++ b/src/include/compiler.h
@@ -71,6 +71,23 @@ __asm__ ( ".equ\tDEBUG_LEVEL, " DEBUG_SYMBOL_STR );
 #define __unused __attribute__((unused))
 #define __used __attribute__((used))
 
+/*
+ * To save space in the binary when multiple-driver images are
+ * compiled, uninitialised data areas can be shared between drivers.
+ * This will typically be used to share statically-allocated receive
+ * and transmit buffers between drivers.
+ *
+ * Use as e.g.
+ *
+ *  struct {
+ *	char	rx_buf[NUM_RX_BUF][RX_BUF_SIZE];
+ *	char	tx_buf[TX_BUF_SIZE];
+ *  } my_static_data __shared;
+ *
+ */
+
+#define __shared __asm__ ( "_shared_bss" );
+
 #endif /* ASSEMBLY */
 
 #endif /* COMPILER_H */
diff --git a/src/include/shared.h b/src/include/shared.h
deleted file mode 100644
index 2cad391a..00000000
--- a/src/include/shared.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SHARED_H
-#define SHARED_H
-
-/*
- * To save space in the binary when multiple-driver images are
- * compiled, uninitialised data areas can be shared between drivers.
- * This will typically be used to share statically-allocated receive
- * and transmit buffers between drivers.
- *
- * Use as e.g.
- *
- *  struct {
- *	char	rx_buf[NUM_RX_BUF][RX_BUF_SIZE];
- *	char	tx_buf[TX_BUF_SIZE];
- *  } my_static_data __shared;
- *
- */
-
-#define __shared __asm__ ( "_shared_bss" );
-
-#endif /* SHARED_H */