Refresh patches

parent 8fdb9d14
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494995
Fix symbol clash between libc and the kernel.
Index: linux-source-3.2/arch/um/Makefile
===================================================================
--- linux-source-3.2.orig/arch/um/Makefile 2013-01-04 07:21:26.329471368 +0900
+++ linux-source-3.2/arch/um/Makefile 2013-01-04 07:21:46.117248747 +0900
@@ -76,7 +76,8 @@
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -95,7 +95,8 @@
# defines more robust
KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
......
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
index 8fb5840..f322503 100644
--- a/arch/x86/um/Makefile
+++ b/arch/x86/um/Makefile
@@ -19,7 +19,8 @@ ifeq ($(CONFIG_X86_32),y)
obj-y += checksum_32.o
obj-$(CONFIG_BINFMT_ELF) += elfcore.o
@@ -20,7 +20,8 @@
obj-y += checksum_32.o syscalls_32.o
obj-$(CONFIG_ELF_CORE) += elfcore.o
-subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
+subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o \
+ ../lib/atomic64_386_32.o ../lib/cmpxchg8b_emu.o
subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o
subarch-$(CONFIG_HIGHMEM) += ../mm/highmem_32.o
else
......@@ -6,23 +6,19 @@ Date: Fri Apr 6 07:18:17 2012 +0900
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 133f7de..1c9d353 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -107,7 +107,6 @@ archheaders:
@@ -122,7 +122,6 @@
archprepare: include/generated/user_constants.h
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
$(call cc-option, -fno-stack-protector,) \
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 36b62bc..d922e86 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -50,9 +50,6 @@ KBUILD_CPPFLAGS += -m64
@@ -51,9 +51,6 @@
ELF_ARCH := i386:x86-64
ELF_FORMAT := elf64-x86-64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment