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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, pat: don't use rb-tree based lookup in reserve_memtype()
  x86: Increase MIN_GAP to include randomized stack

diff --combined arch/x86/mm/pat.c
index d7ebc3a10f2f1aa96aa00913e4b3f2472149facc,9b647f679389453ccc69780d34c0d1380f0ef725..7257cf3decf9455ccb52f8f06bd28bc84a7f57ec
--- 1/arch/x86/mm/pat.c
--- 2/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@@ -424,17 -424,9 +424,9 @@@ int reserve_memtype(u64 start, u64 end
  
        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 +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);
@@@ -1002,7 -994,7 +994,7 @@@ static int memtype_seq_show(struct seq_
        return 0;
  }
  
 -static struct seq_operations memtype_seq_ops = {
 +static const struct seq_operations memtype_seq_ops = {
        .start = memtype_seq_start,
        .next  = memtype_seq_next,
        .stop  = memtype_seq_stop,