aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/skas
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 22:15:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 22:15:20 -0400
commitf59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch)
treef19a5cb72adda3963f83609dbe2314620a4cf63e /arch/um/kernel/skas
parentaac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff)
parent062d52672446014222942cae6934d97769b329f0 (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/skas')
-rw-r--r--arch/um/kernel/skas/clone.c8
-rw-r--r--arch/um/kernel/skas/mmu.c16
-rw-r--r--arch/um/kernel/skas/process.c12
-rw-r--r--arch/um/kernel/skas/syscall.c10
-rw-r--r--arch/um/kernel/skas/uaccess.c4
5 files changed, 25 insertions, 25 deletions
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index e1fd066a3525..289771dadf81 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -7,10 +7,10 @@
7#include <sched.h> 7#include <sched.h>
8#include <asm/unistd.h> 8#include <asm/unistd.h>
9#include <sys/time.h> 9#include <sys/time.h>
10#include "as-layout.h" 10#include <as-layout.h>
11#include "ptrace_user.h" 11#include <ptrace_user.h>
12#include "stub-data.h" 12#include <stub-data.h>
13#include "sysdep/stub.h" 13#include <sysdep/stub.h>
14 14
15/* 15/*
16 * This is in a separate file because it needs to be compiled with any 16 * This is in a separate file because it needs to be compiled with any
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 0a49ef0c2bf4..ff03067a3b14 100644
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -3,14 +3,14 @@
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/mm.h" 6#include <linux/mm.h>
7#include "linux/sched.h" 7#include <linux/sched.h>
8#include "linux/slab.h" 8#include <linux/slab.h>
9#include "asm/pgalloc.h" 9#include <asm/pgalloc.h>
10#include "asm/pgtable.h" 10#include <asm/pgtable.h>
11#include "as-layout.h" 11#include <as-layout.h>
12#include "os.h" 12#include <os.h>
13#include "skas.h" 13#include <skas.h>
14 14
15extern int __syscall_stub_start; 15extern int __syscall_stub_start;
16 16
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 0a9e57e7446b..4da11b3c8ddb 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -3,12 +3,12 @@
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/init.h" 6#include <linux/init.h>
7#include "linux/sched.h" 7#include <linux/sched.h>
8#include "as-layout.h" 8#include <as-layout.h>
9#include "kern.h" 9#include <kern.h>
10#include "os.h" 10#include <os.h>
11#include "skas.h" 11#include <skas.h>
12 12
13int new_mm(unsigned long stack) 13int new_mm(unsigned long stack)
14{ 14{
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 86368a025a96..c0681e097432 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -3,11 +3,11 @@
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/kernel.h" 6#include <linux/kernel.h>
7#include "linux/ptrace.h" 7#include <linux/ptrace.h>
8#include "kern_util.h" 8#include <kern_util.h>
9#include "sysdep/ptrace.h" 9#include <sysdep/ptrace.h>
10#include "sysdep/syscalls.h" 10#include <sysdep/syscalls.h>
11 11
12extern int syscall_table_size; 12extern int syscall_table_size;
13#define NR_SYSCALLS (syscall_table_size / sizeof(void *)) 13#define NR_SYSCALLS (syscall_table_size / sizeof(void *))
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index cd7df79c6a56..1d3e0c17340b 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -11,8 +11,8 @@
11#include <asm/current.h> 11#include <asm/current.h>
12#include <asm/page.h> 12#include <asm/page.h>
13#include <asm/pgtable.h> 13#include <asm/pgtable.h>
14#include "kern_util.h" 14#include <kern_util.h>
15#include "os.h" 15#include <os.h>
16 16
17pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr) 17pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
18{ 18{