diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
| commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
| tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /arch/x86/um/mem_64.c | |
| parent | aac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff) | |
| parent | 062d52672446014222942cae6934d97769b329f0 (diff) | |
Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"UML receives this time only cleanups.
The most outstanding change is the 'include "foo.h"' do 'include
<foo.h>' conversion done by Al Viro.
It touches many files, that's why the diffstat is rather big."
* 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
typo in UserModeLinux-HOWTO
hppfs: fix the return value of get_inode()
hostfs: drop vmtruncate
um: get rid of pointless include "..." where include <...> will do
um: move sysrq.h out of include/shared
um/x86: merge 32 and 64 bit variants of ptrace.h
um/x86: merge 32 and 64bit variants of checksum.h
Diffstat (limited to 'arch/x86/um/mem_64.c')
| -rw-r--r-- | arch/x86/um/mem_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/um/mem_64.c b/arch/x86/um/mem_64.c index 546518727a73..c6492e75797b 100644 --- a/arch/x86/um/mem_64.c +++ b/arch/x86/um/mem_64.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include "linux/mm.h" | 1 | #include <linux/mm.h> |
| 2 | #include "asm/page.h" | 2 | #include <asm/page.h> |
| 3 | #include "asm/mman.h" | 3 | #include <asm/mman.h> |
| 4 | 4 | ||
| 5 | const char *arch_vma_name(struct vm_area_struct *vma) | 5 | const char *arch_vma_name(struct vm_area_struct *vma) |
| 6 | { | 6 | { |