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/um/include/asm/processor-generic.h | |
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/um/include/asm/processor-generic.h')
-rw-r--r-- | arch/um/include/asm/processor-generic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h index 33a6a2423bd2..24e97be814bc 100644 --- a/arch/um/include/asm/processor-generic.h +++ b/arch/um/include/asm/processor-generic.h | |||
@@ -10,9 +10,9 @@ struct pt_regs; | |||
10 | 10 | ||
11 | struct task_struct; | 11 | struct task_struct; |
12 | 12 | ||
13 | #include "asm/ptrace.h" | 13 | #include <asm/ptrace.h> |
14 | #include "registers.h" | 14 | #include <registers.h> |
15 | #include "sysdep/archsetjmp.h" | 15 | #include <sysdep/archsetjmp.h> |
16 | 16 | ||
17 | #include <linux/prefetch.h> | 17 | #include <linux/prefetch.h> |
18 | 18 | ||