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

Commit e84a2a49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML fixes from Richard Weinberger:
 "Fixes two regressions which got introduced this merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Build always with -mcmodel=large on 64bit
  um: Rename print_stack_trace to do_stack_trace
parents 1d07489a fff6540c

arch/um/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -33,12 +33,11 @@ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas 


HEADER_ARCH 	:= $(SUBARCH)



# Additional ARCH settings for x86

ifeq ($(SUBARCH),i386)

ifneq ($(filter $(SUBARCH),x86 x86_64 i386),)

	HEADER_ARCH := x86

endif

ifeq ($(SUBARCH),x86_64)

        HEADER_ARCH := x86



ifdef CONFIG_64BIT

	KBUILD_CFLAGS += -mcmodel=large

endif

arch/um/kernel/sysrq.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct stack_frame { 
	unsigned long return_address;

};



static void print_stack_trace(unsigned long *sp, unsigned long bp)

static void do_stack_trace(unsigned long *sp, unsigned long bp)

{

	int reliable;

	unsigned long addr;
@@ -94,5 +94,5 @@ void show_stack(struct task_struct *task, unsigned long *stack) 
	}

	printk(KERN_CONT "\n");



	print_stack_trace(sp, bp);

	do_stack_trace(sp, bp);

}