From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Dec 2022 22:47:31 +0000 (-0800)
Subject: Merge tag 'edac_updates_for_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.7~3994
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7adcadb98405cb4ef56b2518164026c1069d8669;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'edac_updates_for_6.2' of git://git./linux/kernel/git/ras/ras

Pull EDAC updates from Borislav Petkov:

 - Make ghes_edac a simple module like the rest of the EDAC drivers and
   drop the forced built-in only configuration by disentangling it from
   GHES (Jia He)

 - The usual small cleanups and improvements all over EDAC land

* tag 'edac_updates_for_6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper()
  EDAC/i5400: Fix typo in comment: vaious -> various
  EDAC/mc_sysfs: Increase legacy channel support to 12
  MAINTAINERS: Make Mauro EDAC reviewer
  MAINTAINERS: Make Manivannan Sadhasivam the maintainer of qcom_edac
  EDAC/igen6: Return the correct error type when not the MC owner
  apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
  EDAC: Check for GHES preference in the chipset-specific EDAC drivers
  EDAC/ghes: Make ghes_edac a proper module
  EDAC/ghes: Prepare to make ghes_edac a proper module
  EDAC/ghes: Add a notifier for reporting memory errors
  efi/cper: Export several helpers for ghes_edac to use
  EDAC/i5000: Mark as BROKEN
---

7adcadb98405cb4ef56b2518164026c1069d8669
diff --cc include/acpi/ghes.h
index 292a5c40,2e785d3..3c8bba9
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
@@@ -69,35 -71,14 +71,14 @@@ int ghes_register_vendor_record_notifie
   * @nb: pointer to the notifier_block structure of the vendor record handler.
   */
  void ghes_unregister_vendor_record_notifier(struct notifier_block *nb);
- #endif
- 
- int ghes_estatus_pool_init(unsigned int num_ghes);
- 
- /* From drivers/edac/ghes_edac.c */
- 
- #ifdef CONFIG_EDAC_GHES
- void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err);
- 
- int ghes_edac_register(struct ghes *ghes, struct device *dev);
- 
- void ghes_edac_unregister(struct ghes *ghes);
  
+ struct list_head *ghes_get_devices(void);
  #else
- static inline void ghes_edac_report_mem_error(int sev,
- 				       struct cper_sec_mem_err *mem_err)
- {
- }
- 
- static inline int ghes_edac_register(struct ghes *ghes, struct device *dev)
- {
- 	return -ENODEV;
- }
- 
- static inline void ghes_edac_unregister(struct ghes *ghes)
- {
- }
+ static inline struct list_head *ghes_get_devices(void) { return NULL; }
  #endif
  
 -int ghes_estatus_pool_init(int num_ghes);
++int ghes_estatus_pool_init(unsigned int num_ghes);
+ 
  static inline int acpi_hest_get_version(struct acpi_hest_generic_data *gdata)
  {
  	return gdata->revision >> 8;