Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a959d8 authored by Len Brown's avatar Len Brown
Browse files

Pull linus into release branch

parents 6968e50c 9e625ff8

arch/powerpc/mm/hash_utils_64.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ void __init htab_initialize(void) 
#undef KB

#undef MB



void __init htab_initialize_secondary(void)

void htab_initialize_secondary(void)

{

	if (!platform_is_lpar())

		mtspr(SPRN_SDR1, _SDR1);

arch/um/os-Linux/start_up.c

+12 −10
Original line number Diff line number Diff line
@@ -116,16 +116,16 @@ static int stop_ptraced_child(int pid, void *stack, int exitcode, 
	if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {

		int exit_with = WEXITSTATUS(status);

		if (exit_with == 2)

			printk("check_ptrace : child exited with status 2. "

			printf("check_ptrace : child exited with status 2. "

			       "Serious trouble happening! Try updating your "

			       "host skas patch!\nDisabling SYSEMU support.");

		printk("check_ptrace : child exited with exitcode %d, while "

		printf("check_ptrace : child exited with exitcode %d, while "

		      "expecting %d; status 0x%x", exit_with,

		      exitcode, status);

		if (mustpanic)

			panic("\n");

		else

			printk("\n");

			printf("\n");

		ret = -1;

	}
@@ -183,7 +183,7 @@ static void __init check_sysemu(void) 
	void *stack;

 	int pid, n, status, count=0;



	printk("Checking syscall emulation patch for ptrace...");

	printf("Checking syscall emulation patch for ptrace...");

	sysemu_supported = 0;

	pid = start_ptraced_child(&stack);
@@ -207,10 +207,10 @@ static void __init check_sysemu(void) 
		goto fail_stopped;



	sysemu_supported = 1;

	printk("OK\n");

	printf("OK\n");

	set_using_sysemu(!force_sysemu_disabled);



	printk("Checking advanced syscall emulation patch for ptrace...");

	printf("Checking advanced syscall emulation patch for ptrace...");

	pid = start_ptraced_child(&stack);



	if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
@@ -246,7 +246,7 @@ static void __init check_sysemu(void) 
		goto fail_stopped;



	sysemu_supported = 2;

	printk("OK\n");

	printf("OK\n");



	if ( !force_sysemu_disabled )

		set_using_sysemu(sysemu_supported);
@@ -255,7 +255,7 @@ static void __init check_sysemu(void) 
fail:

	stop_ptraced_child(pid, stack, 1, 0);

fail_stopped:

	printk("missing\n");

	printf("missing\n");

}



static void __init check_ptrace(void)
@@ -263,7 +263,7 @@ static void __init check_ptrace(void) 
	void *stack;

	int pid, syscall, n, status;



	printk("Checking that ptrace can change system call numbers...");

	printf("Checking that ptrace can change system call numbers...");

	pid = start_ptraced_child(&stack);



	if(ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
@@ -292,7 +292,7 @@ static void __init check_ptrace(void) 
		}

	}

	stop_ptraced_child(pid, stack, 0, 1);

	printk("OK\n");

	printf("OK\n");

	check_sysemu();

}
@@ -472,6 +472,8 @@ int can_do_skas(void) 


int have_devanon = 0;



/* Runs on boot kernel stack - already safe to use printk. */



void check_devanon(void)

{

	int fd;

arch/um/os-Linux/user_syms.c

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ EXPORT_SYMBOL(strstr); 
       int sym(void);                  \

       EXPORT_SYMBOL(sym);



extern void readdir64(void) __attribute__((weak));

EXPORT_SYMBOL(readdir64);

extern void truncate64(void) __attribute__((weak));

EXPORT_SYMBOL(truncate64);



#ifdef SUBARCH_i386

EXPORT_SYMBOL(vsyscall_ehdr);

EXPORT_SYMBOL(vsyscall_end);

arch/um/sys-i386/Makefile

+5 −3
Original line number Diff line number Diff line 
obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \

	ptrace_user.o semaphore.o signal.o sigcontext.o stub.o stub_segv.o \

	syscalls.o sysrq.o sys_call_table.o

obj-y := bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \

	ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \

	sys_call_table.o



obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o



obj-$(CONFIG_HIGHMEM) += highmem.o

obj-$(CONFIG_MODULES) += module.o

arch/um/sys-x86_64/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 


#XXX: why into lib-y?

lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \

	ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \

	stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o

	ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \

	syscall_table.o sysrq.o thunk.o

lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o



obj-y := ksyms.o

obj-$(CONFIG_MODULES) += module.o um_module.o