3 files changed, 4 insertions, 4 deletions

diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index dfc63021c9..fc2efcd3e4 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -90,7 +90,7 @@ static long last_disk_activity = -1;
 
 /* private variables */
 
-static struct mutex mmc_mutex;
+static struct mutex mmc_mutex SHAREDBSS_ATTR;
 
 #ifdef HAVE_HOTSWAP
 static long mmc_stack[((DEFAULT_STACK_SIZE*2) + 0x800)/sizeof(long)];
@@ -98,7 +98,7 @@ static long mmc_stack[((DEFAULT_STACK_SIZE*2) + 0x800)/sizeof(long)];
 static long mmc_stack[(DEFAULT_STACK_SIZE*2)/sizeof(long)];
 #endif
 static const char mmc_thread_name[] = "mmc";
-static struct event_queue mmc_queue;
+static struct event_queue mmc_queue SHAREDBSS_ATTR;
 static bool initialized = false;
 static bool new_mmc_circuit;
 
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 403b521db0..c2df00691b 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -42,7 +42,7 @@
 #include "lcd-remote.h"
 #endif
 
-struct event_queue button_queue;
+struct event_queue button_queue SHAREDBSS_ATTR;
 
 static long lastbtn;   /* Last valid button status */
 static long last_read; /* Last button status, for debouncing/filtering */
diff --git a/firmware/drivers/i2c.c b/firmware/drivers/i2c.c
index 8cc7c78a2d..b3a53240b4 100644
--- a/firmware/drivers/i2c.c
+++ b/firmware/drivers/i2c.c
@@ -54,7 +54,7 @@
 /* arbitrary delay loop */
 #define DELAY   do { int _x; for(_x=0;_x<20;_x++);} while (0)
 
-static struct mutex i2c_mtx;
+static struct mutex i2c_mtx SHAREDBSS_ATTR;
 
 void i2c_begin(void)
 {