Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+17
-19
+5
arch/um/Kconfig.common
+5
arch/um/Kconfig.common
+1
-3
arch/um/kernel/initrd.c
+1
-3
arch/um/kernel/initrd.c
···
14
14
static char *initrd __initdata = NULL;
15
15
static int load_initrd(char *filename, void *buf, int size);
16
16
17
-
static int __init read_initrd(void)
17
+
int __init read_initrd(void)
18
18
{
19
19
void *area;
20
20
long long size;
···
45
45
initrd_end = initrd_start + size;
46
46
return 0;
47
47
}
48
-
49
-
__uml_postsetup(read_initrd);
50
48
51
49
static int __init uml_initrd_setup(char *line, int *add)
52
50
{
+2
-4
arch/um/kernel/sysrq.c
+2
-4
arch/um/kernel/sysrq.c
···
20
20
21
21
static void _print_addr(void *data, unsigned long address, int reliable)
22
22
{
23
-
pr_info(" [<%08lx>]", address);
24
-
pr_cont(" %s", reliable ? "" : "? ");
25
-
print_symbol("%s", address);
26
-
pr_cont("\n");
23
+
pr_info(" [<%08lx>] %s%pF\n", address, reliable ? "" : "? ",
24
+
(void *)address);
27
25
}
28
26
29
27
static const struct stacktrace_ops stackops = {
+6
arch/um/kernel/um_arch.c
+6
arch/um/kernel/um_arch.c
···
338
338
return start_uml();
339
339
}
340
340
341
+
int __init __weak read_initrd(void)
342
+
{
343
+
return 0;
344
+
}
345
+
341
346
void __init setup_arch(char **cmdline_p)
342
347
{
343
348
stack_protections((unsigned long) &init_thread_info);
344
349
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
345
350
mem_total_pages(physmem_size, iomem_size, highmem);
351
+
read_initrd();
346
352
347
353
paging_init();
348
354
strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+1
-3
arch/um/os-Linux/skas/process.c
+1
-3
arch/um/os-Linux/skas/process.c
···
21
21
#include <registers.h>
22
22
#include <skas.h>
23
23
#include <sysdep/stub.h>
24
+
#include <linux/threads.h>
24
25
25
26
int is_skas_winch(int pid, int fd, void *data)
26
27
{
···
234
233
return 0;
235
234
}
236
235
237
-
/* Each element set once, and only accessed by a single processor anyway */
238
-
#undef NR_CPUS
239
-
#define NR_CPUS 1
240
236
int userspace_pid[NR_CPUS];
241
237
242
238
int start_userspace(unsigned long stub_stack)
+1
-1
arch/x86/um/ptrace_64.c
+1
-1
arch/x86/um/ptrace_64.c
···
125
125
else if ((addr >= offsetof(struct user, u_debugreg[0])) &&
126
126
(addr <= offsetof(struct user, u_debugreg[7]))) {
127
127
addr -= offsetof(struct user, u_debugreg[0]);
128
-
addr = addr >> 2;
128
+
addr = addr >> 3;
129
129
if ((addr == 4) || (addr == 5))
130
130
return -EIO;
131
131
child->thread.arch.debugregs[addr] = data;