2 files changed, 11 insertions, 22 deletions

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index c1a8bf2bfa57..88bee33e7ecf 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -178,7 +178,7 @@ static struct sysfs_ops memctrlfs_ops = {
 };
 
 #define MEMCTRL_ATTR(_name,_mode,_show,_store)                  \
-struct memctrl_dev_attribute attr_##_name = {                   \
+static struct memctrl_dev_attribute attr_##_name = {                    \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .value  = &_name,                                       \
         .show   = _show,                                        \
@@ -186,7 +186,7 @@ struct memctrl_dev_attribute attr_##_name = {			\
 };
 
 #define MEMCTRL_STRING_ATTR(_name,_data,_mode,_show,_store)     \
-struct memctrl_dev_attribute attr_##_name = {                   \
+static struct memctrl_dev_attribute attr_##_name = {                    \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .value  = _data,                                        \
         .show   = _show,                                        \
@@ -343,7 +343,7 @@ static struct sysfs_ops edac_pci_sysfs_ops = {
 };
 
 #define EDAC_PCI_ATTR(_name,_mode,_show,_store)                 \
-struct edac_pci_dev_attribute edac_pci_attr_##_name = {         \
+static struct edac_pci_dev_attribute edac_pci_attr_##_name = {          \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .value  = &_name,                                       \
         .show   = _show,                                        \
@@ -351,7 +351,7 @@ struct edac_pci_dev_attribute edac_pci_attr_##_name = {		\
 };
 
 #define EDAC_PCI_STRING_ATTR(_name,_data,_mode,_show,_store)    \
-struct edac_pci_dev_attribute edac_pci_attr_##_name = {         \
+static struct edac_pci_dev_attribute edac_pci_attr_##_name = {          \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .value  = _data,                                        \
         .show   = _show,                                        \
@@ -722,7 +722,7 @@ static struct sysfs_ops csrowfs_ops = {
 };
 
 #define CSROWDEV_ATTR(_name,_mode,_show,_store,_private)        \
-struct csrowdev_attribute attr_##_name = {                      \
+static struct csrowdev_attribute attr_##_name = {                       \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .show   = _show,                                        \
         .store  = _store,                                       \
@@ -1066,7 +1066,7 @@ static struct sysfs_ops mci_ops = {
 };
 
 #define MCIDEV_ATTR(_name,_mode,_show,_store)                   \
-struct mcidev_attribute mci_attr_##_name = {                    \
+static struct mcidev_attribute mci_attr_##_name = {                     \
         .attr = {.name = __stringify(_name), .mode = _mode },   \
         .show   = _show,                                        \
         .store  = _store,                                       \
@@ -1220,7 +1220,7 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 
 #ifdef CONFIG_EDAC_DEBUG
 
-void edac_mc_dump_channel(struct channel_info *chan)
+static void edac_mc_dump_channel(struct channel_info *chan)
 {
         debugf4("\tchannel = %p\n", chan);
         debugf4("\tchannel->chan_idx = %d\n", chan->chan_idx);
@@ -1228,9 +1228,8 @@ void edac_mc_dump_channel(struct channel_info *chan)
         debugf4("\tchannel->label = '%s'\n", chan->label);
         debugf4("\tchannel->csrow = %p\n\n", chan->csrow);
 }
-EXPORT_SYMBOL_GPL(edac_mc_dump_channel);
 
-void edac_mc_dump_csrow(struct csrow_info *csrow)
+static void edac_mc_dump_csrow(struct csrow_info *csrow)
 {
         debugf4("\tcsrow = %p\n", csrow);
         debugf4("\tcsrow->csrow_idx = %d\n", csrow->csrow_idx);
@@ -1244,9 +1243,8 @@ void edac_mc_dump_csrow(struct csrow_info *csrow)
         debugf4("\tcsrow->channels = %p\n", csrow->channels);
         debugf4("\tcsrow->mci = %p\n\n", csrow->mci);
 }
-EXPORT_SYMBOL_GPL(edac_mc_dump_csrow);
 
-void edac_mc_dump_mci(struct mem_ctl_info *mci)
+static void edac_mc_dump_mci(struct mem_ctl_info *mci)
 {
         debugf3("\tmci = %p\n", mci);
         debugf3("\tmci->mtype_cap = %lx\n", mci->mtype_cap);
@@ -1260,7 +1258,6 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)
                 mci->mod_name, mci->ctl_name);
         debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
 }
-EXPORT_SYMBOL_GPL(edac_mc_dump_mci);
 
 #endif  /* CONFIG_EDAC_DEBUG */
 
@@ -1576,7 +1573,8 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(edac_mc_del_mc);
 
-void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size)
+static void edac_mc_scrub_block(unsigned long page, unsigned long offset,
+                                u32 size)
 {
         struct page *pg;
         void *virt_addr;
@@ -1605,7 +1603,6 @@ void edac_mc_scrub_block(unsigned long page, unsigned long offset, u32 size)
         if (PageHighMem(pg))
                 local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(edac_mc_scrub_block);
 
 /* FIXME - should return -1 */
 int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h
index 9ad8a20a8de5..fec12f722123 100644
--- a/drivers/edac/edac_mc.h
+++ b/drivers/edac/edac_mc.h
@@ -424,19 +424,11 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
 
 #endif /* CONFIG_PCI */
 
-#ifdef CONFIG_EDAC_DEBUG
-void edac_mc_dump_channel(struct channel_info *chan);
-void edac_mc_dump_mci(struct mem_ctl_info *mci);
-void edac_mc_dump_csrow(struct csrow_info *csrow);
-#endif  /* CONFIG_EDAC_DEBUG */
-
 extern struct mem_ctl_info * edac_mc_find(int idx);
 extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx);
 extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev);
 extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
                                         unsigned long page);
-extern void edac_mc_scrub_block(unsigned long page, unsigned long offset,
-                u32 size);
 
 /*
  * The no info errors are used when error overflows are reported.