Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24140
b: refs/heads/master
c: 54933dd
h: refs/heads/master
v: v3
  • Loading branch information
Dave Peterson authored and Linus Torvalds committed Mar 26, 2006
1 parent cee7097 commit e297cd3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 39f1d8d38aa3f757889a09855b241b6a23e2cac5
refs/heads/master: 54933dddc3e8ccd9db48966d8ada11951cb8a558
38 changes: 13 additions & 25 deletions trunk/drivers/edac/edac_mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,6 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)

#ifdef CONFIG_EDAC_DEBUG

EXPORT_SYMBOL(edac_mc_dump_channel);

void edac_mc_dump_channel(struct channel_info *chan)
{
Expand All @@ -1209,10 +1208,9 @@ 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(edac_mc_dump_channel);


EXPORT_SYMBOL(edac_mc_dump_csrow);

void edac_mc_dump_csrow(struct csrow_info *csrow)
{
debugf4("\tcsrow = %p\n", csrow);
Expand All @@ -1227,10 +1225,9 @@ 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(edac_mc_dump_csrow);


EXPORT_SYMBOL(edac_mc_dump_mci);

void edac_mc_dump_mci(struct mem_ctl_info *mci)
{
debugf3("\tmci = %p\n", mci);
Expand All @@ -1245,6 +1242,7 @@ 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(edac_mc_dump_mci);


#endif /* CONFIG_EDAC_DEBUG */
Expand Down Expand Up @@ -1284,8 +1282,6 @@ static inline char * align_ptr (void *ptr, unsigned size)
}


EXPORT_SYMBOL(edac_mc_alloc);

/**
* edac_mc_alloc: Allocate a struct mem_ctl_info structure
* @size_pvt: size of private storage needed
Expand Down Expand Up @@ -1357,10 +1353,9 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,

return mci;
}
EXPORT_SYMBOL(edac_mc_alloc);


EXPORT_SYMBOL(edac_mc_free);

/**
* edac_mc_free: Free a previously allocated 'mci' structure
* @mci: pointer to a struct mem_ctl_info structure
Expand All @@ -1369,6 +1364,7 @@ void edac_mc_free(struct mem_ctl_info *mci)
{
kfree(mci);
}
EXPORT_SYMBOL(edac_mc_free);

static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)
{
Expand Down Expand Up @@ -1450,8 +1446,6 @@ static void del_mc_from_global_list (struct mem_ctl_info *mci)
}


EXPORT_SYMBOL(edac_mc_add_mc);

/**
* edac_mc_add_mc: Insert the 'mci' structure into the mci global list and
* create sysfs entries associated with mci structure
Expand Down Expand Up @@ -1509,10 +1503,9 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)
up(&mem_ctls_mutex);
return 1;
}
EXPORT_SYMBOL(edac_mc_add_mc);


EXPORT_SYMBOL(edac_mc_del_mc);

/**
* edac_mc_del_mc: Remove sysfs entries for specified mci structure and
* remove mci structure from global list
Expand Down Expand Up @@ -1540,10 +1533,9 @@ struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev)
mci->mod_name, mci->ctl_name, pci_name(mci->pdev));
return mci;
}
EXPORT_SYMBOL(edac_mc_del_mc);


EXPORT_SYMBOL(edac_mc_scrub_block);

void edac_mc_scrub_block(unsigned long page, unsigned long offset,
u32 size)
{
Expand Down Expand Up @@ -1574,11 +1566,10 @@ void edac_mc_scrub_block(unsigned long page, unsigned long offset,
if (PageHighMem(pg))
local_irq_restore(flags);
}
EXPORT_SYMBOL(edac_mc_scrub_block);


/* FIXME - should return -1 */
EXPORT_SYMBOL(edac_mc_find_csrow_by_page);

int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
unsigned long page)
{
Expand Down Expand Up @@ -1615,10 +1606,9 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,

return row;
}
EXPORT_SYMBOL(edac_mc_find_csrow_by_page);


EXPORT_SYMBOL(edac_mc_handle_ce);

/* FIXME - setable log (warning/emerg) levels */
/* FIXME - integrate with evlog: http://evlog.sourceforge.net/ */
void edac_mc_handle_ce(struct mem_ctl_info *mci,
Expand Down Expand Up @@ -1681,10 +1671,9 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
mci->csrows[row].grain);
}
}
EXPORT_SYMBOL(edac_mc_handle_ce);


EXPORT_SYMBOL(edac_mc_handle_ce_no_info);

void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
const char *msg)
{
Expand All @@ -1694,10 +1683,9 @@ void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
mci->ce_noinfo_count++;
mci->ce_count++;
}
EXPORT_SYMBOL(edac_mc_handle_ce_no_info);


EXPORT_SYMBOL(edac_mc_handle_ue);

void edac_mc_handle_ue(struct mem_ctl_info *mci,
unsigned long page_frame_number,
unsigned long offset_in_page, int row,
Expand Down Expand Up @@ -1750,10 +1738,9 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
mci->ue_count++;
mci->csrows[row].ue_count++;
}
EXPORT_SYMBOL(edac_mc_handle_ue);


EXPORT_SYMBOL(edac_mc_handle_ue_no_info);

void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
const char *msg)
{
Expand All @@ -1766,6 +1753,7 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
mci->ue_noinfo_count++;
mci->ue_count++;
}
EXPORT_SYMBOL(edac_mc_handle_ue_no_info);


#ifdef CONFIG_PCI
Expand Down

0 comments on commit e297cd3

Please sign in to comment.