Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / arch / x86 / mm / pat.c

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index d7ebc3a10f2f1aa96aa00913e4b3f2472149facc..7257cf3decf9455ccb52f8f06bd28bc84a7f57ec 100644 (file)
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -424,17 +424,9 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
 
        spin_lock(&memtype_lock);
 
-       entry = memtype_rb_search(&memtype_rbroot, new->start);
-       if (likely(entry != NULL)) {
-               /* To work correctly with list_for_each_entry_continue */
-               entry = list_entry(entry->nd.prev, struct memtype, nd);
-       } else {
-               entry = list_entry(&memtype_list, struct memtype, nd);
-       }
-
        /* Search for existing mapping that overlaps the current range */
        where = NULL;
-       list_for_each_entry_continue(entry, &memtype_list, nd) {
+       list_for_each_entry(entry, &memtype_list, nd) {
                if (end <= entry->start) {
                        where = entry->nd.prev;
                        break;
@@ -532,7 +524,7 @@ int free_memtype(u64 start, u64 end)
         * in sorted start address
         */
        saved_entry = entry;
-       list_for_each_entry(entry, &memtype_list, nd) {
+       list_for_each_entry_from(entry, &memtype_list, nd) {
                if (entry->start == start && entry->end == end) {
                        rb_erase(&entry->rb, &memtype_rbroot);
                        list_del(&entry->nd);