kernel-resource-move-and-rename-ioresource_mem_driver_managed.patch removed from -mm tree
The patch titled
Subject: kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED
has been removed from the -mm tree. Its filename was
kernel-resource-move-and-rename-ioresource_mem_driver_managed.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED
IORESOURCE_MEM_DRIVER_MANAGED currently uses an unused PnP bit, which is always set to 0 by hardware. This is far from beautiful (and confusing), and the bit only applies to SYSRAM. So let's move it out of the bus-specific (PnP) defined bits.
We'll add another SYSRAM specific bit soon. If we ever need more bits for other purposes, we can steal some from "desc", or reshuffle/regroup what we have.
---
include/linux/ioport.h | 4 +++- kernel/kexec_file.c | 2 +- mm/memory_hotplug.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
include/linux/ioport.h renamed from include/linux/ioport.h~kernel-resource-move-and-rename-ioresource_mem_driver_managed +3 -1
@@ -58,6 +58,9 @@ struct resource {#define IORESOURCE_EXT_TYPE_BITS 0x01000000/* Resource extended types */ #define IORESOURCE_SYSRAM 0x01000000/* System RAM (modifier) */ +/* IORESOURCE_SYSRAM specific bits. */ +#define IORESOURCE_SYSRAM_DRIVER_MANAGED 0x02000000/* Always detected via a driver. */ +#define IORESOURCE_EXCLUSIVE 0x08000000/* Userland may not map this resource */ #define IORESOURCE_DISABLED 0x10000000
@@ -103,7 +106,6 @@ struct resource {#define IORESOURCE_MEM_32BIT (3<<3)#define IORESOURCE_MEM_SHADOWABLE (1<<5)/* dup: IORESOURCE_SHADOWABLE */ #define IORESOURCE_MEM_EXPANSIONROM (1<<6) -#define IORESOURCE_MEM_DRIVER_MANAGED (1<<7)/* PnP I/O specific bits (IORESOURCE_BITS) */ #define IORESOURCE_IO_16BIT_ADDR (1<<0)
kernel/kexec_file.c renamed from kernel/kexec_file.c~kernel-resource-move-and-rename-ioresource_mem_driver_managed +1 -1
@@ -521,7 +521,7 @@ static int locate_mem_hole_callback(stru/* Returning 0 will take to next memory range */ /* Don't use memory that will be detected and handled by a driver. */ -if (res->flags &IORESOURCE_MEM_DRIVER_MANAGED ) +if (res->flags &IORESOURCE_SYSRAM_DRIVER_MANAGED )return 0 ;if (sz < kbuf->memsz)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~kernel-resource-move-and-rename-ioresource_mem_driver_managed +2 -2
@@ -105,7 +105,7 @@ static struct resource *register_memory_unsigned long flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;if (strcmp (resource_name,"System RAM" )) - flags |=IORESOURCE_MEM_DRIVER_MANAGED ; + flags |=IORESOURCE_SYSRAM_DRIVER_MANAGED ;/* * Make sure value parsed from 'mem=' only restricts memory adding
@@ -1161,7 +1161,7 @@ EXPORT_SYMBOL_GPL(add_memory);* * For this memory, no entries in /sys/firmware/memmap ("raw firmware-provided * memory map") are created. Also, the created memory resource is flagged -* with IORESOURCE_MEM_DRIVER_MANAGED, so in-kernel users can special-case +* with IORESOURCE_SYSRAM_DRIVER_MANAGED, so in-kernel users can special-case * this memory as well (esp., not place kexec images onto it). * * The resource_name (visible via /proc/iomem) has to have the format
_
Patches currently in -mm which might be from [email protected] are