diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 10:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 10:20:02 -0700 |
| commit | ec059019b7e6ae3926a8e1dec02a62d64dd8c060 (patch) | |
| tree | ab60e0f2d21154dda05f58af310a66c94179d70a /arch/um/os-Linux/skas/process.c | |
| parent | 1251704a631b62591ad1d1b6ead252e9e597d5f5 (diff) | |
| parent | ce4586063f1af780b1c6b7e344907e6f9c1ba59a (diff) | |
| download | talos-op-linux-ec059019b7e6ae3926a8e1dec02a62d64dd8c060.tar.gz talos-op-linux-ec059019b7e6ae3926a8e1dec02a62d64dd8c060.zip | |
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"No new stuff, just fixes"
* 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Add missing NR_CPUS include
um: Fix to call read_initrd after init_bootmem
um: Include kbuild.h instead of duplicating its macros
um: Fix PTRACE_POKEUSER on x86_64
um: Set number of CPUs
um: Fix _print_addr()
Diffstat (limited to 'arch/um/os-Linux/skas/process.c')
| -rw-r--r-- | arch/um/os-Linux/skas/process.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 23025d645160..03b3c4cc7735 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c @@ -21,6 +21,7 @@ #include <registers.h> #include <skas.h> #include <sysdep/stub.h> +#include <linux/threads.h> int is_skas_winch(int pid, int fd, void *data) { @@ -233,9 +234,6 @@ static int userspace_tramp(void *stack) return 0; } -/* Each element set once, and only accessed by a single processor anyway */ -#undef NR_CPUS -#define NR_CPUS 1 int userspace_pid[NR_CPUS]; int start_userspace(unsigned long stub_stack) |
