UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: pat.c consolidate list_add handling in reserve_memtype 

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Suresh B Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann 2008-06-20 22:05:37 +02:00 committed by Ingo Molnar
parent 3e9c83b309
commit f6887264de
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86/mm/pat.c
View File

@ -198,6 +198,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
{ {
struct memtype *new, *entry; struct memtype *new, *entry;
unsigned long actual_type; unsigned long actual_type;
struct list_head *where;
int err = 0; int err = 0;
BUG_ON(start >= end); /* end is exclusive */ BUG_ON(start >= end); /* end is exclusive */
@ -251,13 +252,12 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
spin_lock(&memtype_lock); spin_lock(&memtype_lock);
/* Search for existing mapping that overlaps the current range */ /* Search for existing mapping that overlaps the current range */
where = NULL;
list_for_each_entry(entry, &memtype_list, nd) { list_for_each_entry(entry, &memtype_list, nd) {
struct memtype *saved_ptr; struct memtype *saved_ptr;
if (entry->start >= end) { if (entry->start >= end) {
dprintk("New Entry\n"); where = entry->nd.prev;
list_add(&new->nd, entry->nd.prev);
new = NULL;
break; break;
} }
@ -295,9 +295,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
dprintk("Overlap at 0x%Lx-0x%Lx\n", dprintk("Overlap at 0x%Lx-0x%Lx\n",
saved_ptr->start, saved_ptr->end); saved_ptr->start, saved_ptr->end);
/* No conflict. Go ahead and add this new entry */ where = saved_ptr->nd.prev;
list_add(&new->nd, saved_ptr->nd.prev);
new = NULL;
break; break;
} }
@ -335,9 +333,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
dprintk("Overlap at 0x%Lx-0x%Lx\n", dprintk("Overlap at 0x%Lx-0x%Lx\n",
saved_ptr->start, saved_ptr->end); saved_ptr->start, saved_ptr->end);
/* No conflict. Go ahead and add this new entry */ where = &saved_ptr->nd;
list_add(&new->nd, &saved_ptr->nd);
new = NULL;
break; break;
} }
} }
@ -354,11 +350,10 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
return err; return err;
} }
if (new) { if (where)
/* No conflict. Not yet added to the list. Add to the tail */ list_add(&new->nd, where);
else
list_add_tail(&new->nd, &memtype_list); list_add_tail(&new->nd, &memtype_list);
dprintk("New Entry\n");
}
spin_unlock(&memtype_lock); spin_unlock(&memtype_lock);