• Linus Torvalds's avatar
    Merge tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 0160928e
    Linus Torvalds authored
    Pull EDAC updates from Borislav Petkov:
     "EDAC updates all over the place:
    
       - Enablement for AMD F15h models 0x60 CPUs.  Most notably DDR4 RAM
         support.  Out of tree stuff is adding the required PCI IDs.  From
         Aravind Gopalakrishnan.
    
       - Enable amd64_edac for 32-bit due to popular demand.  From Tomasz
         Pala.
    
       - Convert the AMD MCE injection module to debugfs, where it belongs.
    
       - Misc EDAC cleanups"
    
    * tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      EDAC, MCE, AMD: Correct formatting of decoded text
      EDAC, mce_amd_inj: Add an injector function
      EDAC, mce_amd_inj: Add hw-injection attributes
      EDAC, mce_amd_inj: Enable direct writes to MCE MSRs
      EDAC, mce_amd_inj: Convert mce_amd_inj module to debugfs
      EDAC: Delete unnecessary check before calling pci_dev_put()
      EDAC, pci_sysfs: remove unneccessary ifdef around entire file
      ghes_edac: Use snprintf() to silence a static checker warning
      amd64_edac: Build module on x86-32
      EDAC, MCE, AMD: Add decoding table for MC6 xec
      amd64_edac: Add F15h M60h support
      {mv64x60,ppc4xx}_edac,: Remove deprecated IRQF_DISABLED
      EDAC: Sync memory types and names
      EDAC: Add DDR3 LRDIMM entries to edac_mem_types
      x86, amd_nb: Add device IDs to NB tables for F15h M60h
      pci_ids: Add PCI device IDs for F15h M60h
    0160928e
i3200_edac.c 12.9 KB