Two small EDAC fixes.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRi31iAAoJEBLB8Bhh3lVKiaQQAIZ4R6/9QSt7KbP5VLN1ksv2 qV2VOGPuxkhGoO/vfUJ0RKFj0NgnQFYizKl+vjZL/ahQy9yqelWInoc/TO7tHGol rxlyCoxmS5kuXwbs8CYhC5OQBvuFSTfk/8Ecu4lZa/PfPKs4IXaq+jzjqfk6/QvC jjfJ/4TIbyHLR48tbjoiJtjMQlsZOZ+R9o6Ic0Qw49GlqbIdZ15KzZVnuLRxJWby 4S2hQnBWkMfc/RYXfliUs6TsXd55qyd88La6PHeY/BJRxQoaBvsPWLEd6Pk6RNWd RfpoEHCdUfnFBQMvO5C50/Dp6iKXJ4xqh9qrPg0LVlTtGbPL8gdDfK5QEElhEiuw vM9dzfNXFvE4Pavx32WSm7ql2LD9Qf8ZdLPxMlvjNGW14+oQexHmDI6sdU5iVYxb toct5jF7MwEy6GQQcwmp84V8y5FU+MyEtT+w9OKLpay/9Bqcq0I/Mv6LJWH10IDC bpfkaUm10C1aF2/vP6BB48NGUUElZIxXg9VapzX+AuRs6kN7LLOmM38G371HPEbV wcsRCU1znxo1Yjehen6oI9I2AQ4NuMcHplK2FiD0I1AzlRQ/BM6TeHejy84SJMgf QEQkjwh8DAClzcKJFlt9uoIglCLLjY/WDVSLgvvhv+/kQIXrLV7zCAhGR2CE27ci XQsmruJYlPt0A0xkOh// =uyan -----END PGP SIGNATURE----- Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp Pull two small EDAC fixes from Borislav Petkov. * tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Don't give write permission to read-only files EDAC, mc_sysfs.c: Fix string array pointer types
This commit is contained in:
commit
7462543abb
1 changed files with 9 additions and 9 deletions
|
@ -87,7 +87,7 @@ static struct device *mci_pdev;
|
|||
/*
|
||||
* various constants for Memory Controllers
|
||||
*/
|
||||
static const char *mem_types[] = {
|
||||
static const char * const mem_types[] = {
|
||||
[MEM_EMPTY] = "Empty",
|
||||
[MEM_RESERVED] = "Reserved",
|
||||
[MEM_UNKNOWN] = "Unknown",
|
||||
|
@ -107,7 +107,7 @@ static const char *mem_types[] = {
|
|||
[MEM_RDDR3] = "Registered-DDR3"
|
||||
};
|
||||
|
||||
static const char *dev_types[] = {
|
||||
static const char * const dev_types[] = {
|
||||
[DEV_UNKNOWN] = "Unknown",
|
||||
[DEV_X1] = "x1",
|
||||
[DEV_X2] = "x2",
|
||||
|
@ -118,7 +118,7 @@ static const char *dev_types[] = {
|
|||
[DEV_X64] = "x64"
|
||||
};
|
||||
|
||||
static const char *edac_caps[] = {
|
||||
static const char * const edac_caps[] = {
|
||||
[EDAC_UNKNOWN] = "Unknown",
|
||||
[EDAC_NONE] = "None",
|
||||
[EDAC_RESERVED] = "Reserved",
|
||||
|
@ -327,17 +327,17 @@ static struct device_attribute *dynamic_csrow_dimm_attr[] = {
|
|||
};
|
||||
|
||||
/* possible dynamic channel ce_count attribute files */
|
||||
DEVICE_CHANNEL(ch0_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch0_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 0);
|
||||
DEVICE_CHANNEL(ch1_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch1_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 1);
|
||||
DEVICE_CHANNEL(ch2_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch2_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 2);
|
||||
DEVICE_CHANNEL(ch3_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch3_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 3);
|
||||
DEVICE_CHANNEL(ch4_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch4_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 4);
|
||||
DEVICE_CHANNEL(ch5_ce_count, S_IRUGO | S_IWUSR,
|
||||
DEVICE_CHANNEL(ch5_ce_count, S_IRUGO,
|
||||
channel_ce_count_show, NULL, 5);
|
||||
|
||||
/* Total possible dynamic ce_count attribute file table */
|
||||
|
|
Loading…
Reference in a new issue