tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-9
+9
-9
drivers/edac/edac_mc_sysfs.c
+9
-9
drivers/edac/edac_mc_sysfs.c
···
87
87
/*
88
88
* various constants for Memory Controllers
89
89
*/
90
-
static const char *mem_types[] = {
90
+
static const char * const mem_types[] = {
91
91
[MEM_EMPTY] = "Empty",
92
92
[MEM_RESERVED] = "Reserved",
93
93
[MEM_UNKNOWN] = "Unknown",
···
107
107
[MEM_RDDR3] = "Registered-DDR3"
108
108
};
109
109
110
-
static const char *dev_types[] = {
110
+
static const char * const dev_types[] = {
111
111
[DEV_UNKNOWN] = "Unknown",
112
112
[DEV_X1] = "x1",
113
113
[DEV_X2] = "x2",
···
118
118
[DEV_X64] = "x64"
119
119
};
120
120
121
-
static const char *edac_caps[] = {
121
+
static const char * const edac_caps[] = {
122
122
[EDAC_UNKNOWN] = "Unknown",
123
123
[EDAC_NONE] = "None",
124
124
[EDAC_RESERVED] = "Reserved",
···
327
327
};
328
328
329
329
/* possible dynamic channel ce_count attribute files */
330
-
DEVICE_CHANNEL(ch0_ce_count, S_IRUGO | S_IWUSR,
330
+
DEVICE_CHANNEL(ch0_ce_count, S_IRUGO,
331
331
channel_ce_count_show, NULL, 0);
332
-
DEVICE_CHANNEL(ch1_ce_count, S_IRUGO | S_IWUSR,
332
+
DEVICE_CHANNEL(ch1_ce_count, S_IRUGO,
333
333
channel_ce_count_show, NULL, 1);
334
-
DEVICE_CHANNEL(ch2_ce_count, S_IRUGO | S_IWUSR,
334
+
DEVICE_CHANNEL(ch2_ce_count, S_IRUGO,
335
335
channel_ce_count_show, NULL, 2);
336
-
DEVICE_CHANNEL(ch3_ce_count, S_IRUGO | S_IWUSR,
336
+
DEVICE_CHANNEL(ch3_ce_count, S_IRUGO,
337
337
channel_ce_count_show, NULL, 3);
338
-
DEVICE_CHANNEL(ch4_ce_count, S_IRUGO | S_IWUSR,
338
+
DEVICE_CHANNEL(ch4_ce_count, S_IRUGO,
339
339
channel_ce_count_show, NULL, 4);
340
-
DEVICE_CHANNEL(ch5_ce_count, S_IRUGO | S_IWUSR,
340
+
DEVICE_CHANNEL(ch5_ce_count, S_IRUGO,
341
341
channel_ce_count_show, NULL, 5);
342
342
343
343
/* Total possible dynamic ce_count attribute file table */