[PATCH] edac: disable a few sysfs files to avoid them becoming an ABI

Disable (via ugly #if 0's) the 3 sysfs files that I think by now we all
agree are very much wrong. These files shouldn't become part of the ABI by
the 2.6.16 release, so I rather have this minimal patch merged to disable
them for now, the real fix can then come during the 2.6.17 devel window.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Arjan van de Ven and committed by Linus Torvalds 4136cabf cd6ef84e

+9 -3
+9 -3
drivers/edac/edac_mc.c
··· 132 * /sys/devices/system/edac/mc; 133 * data structures and methods 134 */ 135 static ssize_t memctrl_string_show(void *ptr, char *buffer) 136 { 137 char *value = (char*) ptr; 138 return sprintf(buffer, "%s\n", value); 139 } 140 141 static ssize_t memctrl_int_show(void *ptr, char *buffer) 142 { ··· 209 }; 210 211 /* cwrow<id> attribute f*/ 212 MEMCTRL_STRING_ATTR(mc_version,EDAC_MC_VERSION,S_IRUGO,memctrl_string_show,NULL); 213 214 /* csrow<id> control files */ 215 MEMCTRL_ATTR(panic_on_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store); ··· 226 &attr_log_ue, 227 &attr_log_ce, 228 &attr_poll_msec, 229 - &attr_mc_version, 230 NULL, 231 }; 232 ··· 312 int *count; 313 }; 314 315 /* Output the list as: vendor_id:device:id<,vendor_id:device_id> */ 316 static ssize_t edac_pci_list_string_show(void *ptr, char *buffer) 317 { ··· 435 return count; 436 } 437 438 static ssize_t edac_pci_int_show(void *ptr, char *buffer) 439 { 440 int *value = ptr; ··· 504 .store = _store, \ 505 }; 506 507 static struct list_control pci_whitelist_control = { 508 .list = pci_whitelist, 509 .count = &pci_whitelist_count ··· 527 S_IRUGO|S_IWUSR, 528 edac_pci_list_string_show, 529 edac_pci_list_string_store); 530 531 /* PCI Parity control files */ 532 EDAC_PCI_ATTR(check_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store); ··· 539 &edac_pci_attr_check_pci_parity, 540 &edac_pci_attr_panic_on_pci_parity, 541 &edac_pci_attr_pci_parity_count, 542 - &edac_pci_attr_pci_parity_whitelist, 543 - &edac_pci_attr_pci_parity_blacklist, 544 NULL, 545 }; 546
··· 132 * /sys/devices/system/edac/mc; 133 * data structures and methods 134 */ 135 + #if 0 136 static ssize_t memctrl_string_show(void *ptr, char *buffer) 137 { 138 char *value = (char*) ptr; 139 return sprintf(buffer, "%s\n", value); 140 } 141 + #endif 142 143 static ssize_t memctrl_int_show(void *ptr, char *buffer) 144 { ··· 207 }; 208 209 /* cwrow<id> attribute f*/ 210 + #if 0 211 MEMCTRL_STRING_ATTR(mc_version,EDAC_MC_VERSION,S_IRUGO,memctrl_string_show,NULL); 212 + #endif 213 214 /* csrow<id> control files */ 215 MEMCTRL_ATTR(panic_on_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store); ··· 222 &attr_log_ue, 223 &attr_log_ce, 224 &attr_poll_msec, 225 NULL, 226 }; 227 ··· 309 int *count; 310 }; 311 312 + 313 + #if 0 314 /* Output the list as: vendor_id:device:id<,vendor_id:device_id> */ 315 static ssize_t edac_pci_list_string_show(void *ptr, char *buffer) 316 { ··· 430 return count; 431 } 432 433 + #endif 434 static ssize_t edac_pci_int_show(void *ptr, char *buffer) 435 { 436 int *value = ptr; ··· 498 .store = _store, \ 499 }; 500 501 + #if 0 502 static struct list_control pci_whitelist_control = { 503 .list = pci_whitelist, 504 .count = &pci_whitelist_count ··· 520 S_IRUGO|S_IWUSR, 521 edac_pci_list_string_show, 522 edac_pci_list_string_store); 523 + #endif 524 525 /* PCI Parity control files */ 526 EDAC_PCI_ATTR(check_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store); ··· 531 &edac_pci_attr_check_pci_parity, 532 &edac_pci_attr_panic_on_pci_parity, 533 &edac_pci_attr_pci_parity_count, 534 NULL, 535 }; 536