|
@@ -270,13 +270,16 @@ struct dev_pagemap *find_dev_pagemap(resource_size_t phys)
|
|
void *devm_memremap_pages(struct device *dev, struct resource *res,
|
|
void *devm_memremap_pages(struct device *dev, struct resource *res,
|
|
struct percpu_ref *ref, struct vmem_altmap *altmap)
|
|
struct percpu_ref *ref, struct vmem_altmap *altmap)
|
|
{
|
|
{
|
|
- int is_ram = region_intersects(res->start, resource_size(res),
|
|
|
|
- "System RAM");
|
|
|
|
resource_size_t key, align_start, align_size, align_end;
|
|
resource_size_t key, align_start, align_size, align_end;
|
|
struct dev_pagemap *pgmap;
|
|
struct dev_pagemap *pgmap;
|
|
struct page_map *page_map;
|
|
struct page_map *page_map;
|
|
|
|
+ int error, nid, is_ram;
|
|
unsigned long pfn;
|
|
unsigned long pfn;
|
|
- int error, nid;
|
|
|
|
|
|
+
|
|
|
|
+ align_start = res->start & ~(SECTION_SIZE - 1);
|
|
|
|
+ align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
|
|
|
|
+ - align_start;
|
|
|
|
+ is_ram = region_intersects(align_start, align_size, "System RAM");
|
|
|
|
|
|
if (is_ram == REGION_MIXED) {
|
|
if (is_ram == REGION_MIXED) {
|
|
WARN_ONCE(1, "%s attempted on mixed region %pr\n",
|
|
WARN_ONCE(1, "%s attempted on mixed region %pr\n",
|
|
@@ -314,8 +317,6 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
|
|
|
|
|
|
mutex_lock(&pgmap_lock);
|
|
mutex_lock(&pgmap_lock);
|
|
error = 0;
|
|
error = 0;
|
|
- align_start = res->start & ~(SECTION_SIZE - 1);
|
|
|
|
- align_size = ALIGN(resource_size(res), SECTION_SIZE);
|
|
|
|
align_end = align_start + align_size - 1;
|
|
align_end = align_start + align_size - 1;
|
|
for (key = align_start; key <= align_end; key += SECTION_SIZE) {
|
|
for (key = align_start; key <= align_end; key += SECTION_SIZE) {
|
|
struct dev_pagemap *dup;
|
|
struct dev_pagemap *dup;
|