summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 12:44:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-22 12:44:22 -0700
commit1e0695cbc814c718763ed93f20711b12c46cfa40 (patch)
treea367fd984ddb5c12e80f8dfd9a41f385d7a19a97 /include
parent51f0885e5415b4cc6535e9cdcc5145bfbc134353 (diff)
parent9713faecff3d071de1208b081d4943b002e9cb1c (diff)
downloadlinux-3.10-1e0695cbc814c718763ed93f20711b12c46cfa40.tar.gz
linux-3.10-1e0695cbc814c718763ed93f20711b12c46cfa40.tar.bz2
linux-3.10-1e0695cbc814c718763ed93f20711b12c46cfa40.zip
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fixes from Borislav Petkov: "A fix from Mauro to correct csrow size accounting in sysfs and a sparse fix from Stephen Hemminger." * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Merge mci.mem_is_per_rank with mci.csbased amd64_edac: Correct DIMM sizes EDAC: Make sysfs functions static
Diffstat (limited to 'include')
-rw-r--r--include/linux/edac.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 4fd4999ccb5..0b763276f61 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -561,7 +561,6 @@ struct csrow_info {
u32 ue_count; /* Uncorrectable Errors for this csrow */
u32 ce_count; /* Correctable Errors for this csrow */
- u32 nr_pages; /* combined pages count of all channels */
struct mem_ctl_info *mci; /* the parent */
@@ -676,11 +675,11 @@ struct mem_ctl_info {
* sees memory sticks ("dimms"), and the ones that sees memory ranks.
* All old memory controllers enumerate memories per rank, but most
* of the recent drivers enumerate memories per DIMM, instead.
- * When the memory controller is per rank, mem_is_per_rank is true.
+ * When the memory controller is per rank, csbased is true.
*/
unsigned n_layers;
struct edac_mc_layer *layers;
- bool mem_is_per_rank;
+ bool csbased;
/*
* DIMM info. Will eventually remove the entire csrows_info some day
@@ -741,8 +740,6 @@ struct mem_ctl_info {
u32 fake_inject_ue;
u16 fake_inject_count;
#endif
- __u8 csbased : 1, /* csrow-based memory controller */
- __resv : 7;
};
#endif