mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 18:11:39 +00:00
x86: pat.c final cleanup of loop body 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:
parent
64fe44c38b
commit
33af9039cb
1 changed files with 11 additions and 19 deletions
|
@ -281,32 +281,24 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
|
||||||
/* Search for existing mapping that overlaps the current range */
|
/* Search for existing mapping that overlaps the current range */
|
||||||
where = NULL;
|
where = NULL;
|
||||||
list_for_each_entry(entry, &memtype_list, nd) {
|
list_for_each_entry(entry, &memtype_list, nd) {
|
||||||
if (entry->start >= end) {
|
if (end <= entry->start) {
|
||||||
where = entry->nd.prev;
|
where = entry->nd.prev;
|
||||||
break;
|
break;
|
||||||
}
|
} else if (start <= entry->start) { /* end > entry->start */
|
||||||
|
|
||||||
if (start <= entry->start && end >= entry->start) {
|
|
||||||
err = chk_conflict(new, entry, new_type);
|
err = chk_conflict(new, entry, new_type);
|
||||||
if (err) {
|
if (!err) {
|
||||||
break;
|
dprintk("Overlap at 0x%Lx-0x%Lx\n",
|
||||||
|
entry->start, entry->end);
|
||||||
|
where = entry->nd.prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
dprintk("Overlap at 0x%Lx-0x%Lx\n",
|
|
||||||
entry->start, entry->end);
|
|
||||||
where = entry->nd.prev;
|
|
||||||
break;
|
break;
|
||||||
}
|
} else if (start < entry->end) { /* start > entry->start */
|
||||||
|
|
||||||
if (start < entry->end) {
|
|
||||||
err = chk_conflict(new, entry, new_type);
|
err = chk_conflict(new, entry, new_type);
|
||||||
if (err) {
|
if (!err) {
|
||||||
break;
|
dprintk("Overlap at 0x%Lx-0x%Lx\n",
|
||||||
|
entry->start, entry->end);
|
||||||
|
where = &entry->nd;
|
||||||
}
|
}
|
||||||
|
|
||||||
dprintk("Overlap at 0x%Lx-0x%Lx\n",
|
|
||||||
entry->start, entry->end);
|
|
||||||
where = &entry->nd;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue