From 8ed12fcc194d93c6a17714120a7027ee4d76a881 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 21 Nov 2013 09:27:37 +0100 Subject: um: Rename print_stack_trace to do_stack_trace We cannot use print_stack_trace because the name conflicts with linux/stacktrace.h. Reported-by: Randy Dunlap Acked-by: Randy Dunlap Signed-off-by: Richard Weinberger diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index 4d6fdf6..799d7e4 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c @@ -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); } -- cgit v0.10.2 From fff6540cbcb56a6ae92d4fd4b0864c8d13a8f932 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Fri, 29 Nov 2013 15:39:41 +0100 Subject: um: Build always with -mcmodel=large on 64bit On UML SUBARCH can be x86, x86_64 and i386 and if it is x86 we use uname -m to select a defconfig. Therefore we can no longer use -mcmodel=large only if SUBARCH is x86_64. Reported-and-tested-by: Boaz Harrosh Signed-off-by: Richard Weinberger diff --git a/arch/um/Makefile b/arch/um/Makefile index 48d92bb..36e658a 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -33,12 +33,11 @@ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas HEADER_ARCH := $(SUBARCH) -# Additional ARCH settings for x86 -ifeq ($(SUBARCH),i386) - HEADER_ARCH := x86 +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 -- cgit v0.10.2