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/drivers/mconsole_kern.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/um/drivers/mconsole_kern.c')
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 9efeb6da48bc..79ccfe6c7078 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -27,13 +27,13 @@ | |||
27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
28 | #include <asm/switch_to.h> | 28 | #include <asm/switch_to.h> |
29 | 29 | ||
30 | #include "init.h" | 30 | #include <init.h> |
31 | #include "irq_kern.h" | 31 | #include <irq_kern.h> |
32 | #include "irq_user.h" | 32 | #include <irq_user.h> |
33 | #include "kern_util.h" | 33 | #include <kern_util.h> |
34 | #include "mconsole.h" | 34 | #include "mconsole.h" |
35 | #include "mconsole_kern.h" | 35 | #include "mconsole_kern.h" |
36 | #include "os.h" | 36 | #include <os.h> |
37 | 37 | ||
38 | static int do_unlink_socket(struct notifier_block *notifier, | 38 | static int do_unlink_socket(struct notifier_block *notifier, |
39 | unsigned long what, void *data) | 39 | unsigned long what, void *data) |