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/shared/sysdep/stub.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/x86/um/shared/sysdep/stub.h')
| -rw-r--r-- | arch/x86/um/shared/sysdep/stub.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/shared/sysdep/stub.h b/arch/x86/um/shared/sysdep/stub.h index bd161e300102..3f55e5bd3cec 100644 --- a/arch/x86/um/shared/sysdep/stub.h +++ b/arch/x86/um/shared/sysdep/stub.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #include <asm/unistd.h> | 1 | #include <asm/unistd.h> |
| 2 | #include <sys/mman.h> | 2 | #include <sys/mman.h> |
| 3 | #include <signal.h> | 3 | #include <signal.h> |
| 4 | #include "as-layout.h" | 4 | #include <as-layout.h> |
| 5 | #include "stub-data.h" | 5 | #include <stub-data.h> |
| 6 | 6 | ||
| 7 | #ifdef __i386__ | 7 | #ifdef __i386__ |
| 8 | #include "stub_32.h" | 8 | #include "stub_32.h" |