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/kernel/smp.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/kernel/smp.c')
-rw-r--r-- | arch/um/kernel/smp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index a02b7e9e6b94..5c8c3ea7db7b 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
@@ -3,24 +3,24 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/percpu.h" | 6 | #include <linux/percpu.h> |
7 | #include "asm/pgalloc.h" | 7 | #include <asm/pgalloc.h> |
8 | #include "asm/tlb.h" | 8 | #include <asm/tlb.h> |
9 | 9 | ||
10 | #ifdef CONFIG_SMP | 10 | #ifdef CONFIG_SMP |
11 | 11 | ||
12 | #include "linux/sched.h" | 12 | #include <linux/sched.h> |
13 | #include "linux/module.h" | 13 | #include <linux/module.h> |
14 | #include "linux/threads.h" | 14 | #include <linux/threads.h> |
15 | #include "linux/interrupt.h" | 15 | #include <linux/interrupt.h> |
16 | #include "linux/err.h" | 16 | #include <linux/err.h> |
17 | #include "linux/hardirq.h" | 17 | #include <linux/hardirq.h> |
18 | #include "asm/smp.h" | 18 | #include <asm/smp.h> |
19 | #include "asm/processor.h" | 19 | #include <asm/processor.h> |
20 | #include "asm/spinlock.h" | 20 | #include <asm/spinlock.h> |
21 | #include "kern.h" | 21 | #include <kern.h> |
22 | #include "irq_user.h" | 22 | #include <irq_user.h> |
23 | #include "os.h" | 23 | #include <os.h> |
24 | 24 | ||
25 | /* Per CPU bogomips and other parameters | 25 | /* Per CPU bogomips and other parameters |
26 | * The only piece used here is the ipi pipe, which is set before SMP is | 26 | * The only piece used here is the ipi pipe, which is set before SMP is |