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

Browse source

Pull x86 mm changes from Ingo Molnar:
 "Misc improvements:

   - Fix /proc/mtrr reporting
   - Fix ioremap printout
   - Remove the unused pvclock fixmap entry on 32-bit
   - misc cleanups"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioremap: Correct function name output
  x86: Fix /proc/mtrr with base/size more than 44bits
  ix86: Don't waste fixmap entries
  x86/mm: Drop unneeded include <asm/*pgtable, page*_types.h>
  x86_64: Correct phys_addr in cleanup_highmap comment

...

This commit is contained in:

Linus Torvalds 2013-07-02 16:29:05 -07:00

parent fdd78889aa 4f4319a02a

commit 1982269a5c

6 changed files with 26 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/boot/compressed/head_64.S

View file

2

arch/x86/include/asm/fixmap.h

View file

21

arch/x86/kernel/cpu/mtrr/generic.c

View file

16

arch/x86/kernel/cpu/mtrr/main.c

View file

2

arch/x86/mm/init_64.c

View file

8

arch/x86/mm/ioremap.c

View file