diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:25 -0700 |
| commit | ab8aadbda7d59d4674ef614cba2a67c50667a6af (patch) | |
| tree | 836c91ed751ec6e93209a1bfdd46ce36f96ce80e /arch/x86/mm/pat_rbtree.c | |
| parent | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 (diff) | |
| parent | 499a00e92dd9a75395081f595e681629eb1eebad (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, Calgary: Increase max PHB number
x86: Fix rebooting on Dell Precision WorkStation T7400
x86: Fix vsyscall on gcc 4.5 with -Os
x86, pat: Proper init of memtype subtree_max_end
um, hweight: Fix UML boot crash due to x86 optimized hweight
x86, setup: Set ax register in boot vga query
percpu, x86: Avoid warnings of unused variables in per cpu
x86, irq: Rename gsi_end gsi_top, and fix off by one errors
x86: use __ASSEMBLY__ rather than __ASSEMBLER__
Diffstat (limited to 'arch/x86/mm/pat_rbtree.c')
| -rw-r--r-- | arch/x86/mm/pat_rbtree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c index f537087bb740..f20eeec85a86 100644 --- a/arch/x86/mm/pat_rbtree.c +++ b/arch/x86/mm/pat_rbtree.c @@ -226,6 +226,7 @@ int rbt_memtype_check_insert(struct memtype *new, unsigned long *ret_type) if (ret_type) new->type = *ret_type; + new->subtree_max_end = new->end; memtype_rb_insert(&memtype_rbroot, new); } return err; |