• Linus Torvalds's avatar
    Merge branch 'core-resources-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d37a14bb
    Linus Torvalds authored
    Pull ram resource handling changes from Ingo Molnar:
     "Core kernel resource handling changes to support NVDIMM error
      injection.
    
      This tree introduces a new I/O resource type, IORESOURCE_SYSTEM_RAM,
      for System RAM while keeping the current IORESOURCE_MEM type bit set
      for all memory-mapped ranges (including System RAM) for backward
      compatibility.
    
      With this resource flag it no longer takes a strcmp() loop through the
      resource tree to find "System RAM" resources.
    
      The new resource type is then used to extend ACPI/APEI error injection
      facility to also support NVDIMM"
    
    * 'core-resources-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      ACPI/EINJ: Allow memory error injection to NVDIMM
      resource: Kill walk_iomem_res()
      x86/kexec: Remove walk_iomem_res() call with GART type
      x86, kexec, nvdimm: Use walk_iomem_res_desc() for iomem search
      resource: Add walk_iomem_res_desc()
      memremap: Change region_intersects() to take @flags and @desc
      arm/samsung: Change s3c_pm_run_res() to use System RAM type
      resource: Change walk_system_ram() to use System RAM type
      drivers: Initialize resource entry to zero
      xen, mm: Set IORESOURCE_SYSTEM_RAM to System RAM
      kexec: Set IORESOURCE_SYSTEM_RAM for System RAM
      arch: Set IORESOURCE_SYSTEM_RAM flag for System RAM
      ia64: Set System RAM type and descriptor
      x86/e820: Set System RAM type and descriptor
      resource: Add I/O resource descriptor
      resource: Handle resource flags properly
      resource: Add System RAM resource type
    d37a14bb
memremap.c 11.4 KB