From 89df55b65049b4a5b408d409a5a00f5986e24c29 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 16 Jan 2014 21:59:49 +0100 Subject: [PATCH] kernel: fix multi-arch kernel compile. --- lfs/linux | 3 +-- ...-atomic64-operand-requires-impossible-reload.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch diff --git a/lfs/linux b/lfs/linux index 68e91d40af..ee754a28b6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -122,11 +122,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Grsecurity-patches ifneq "$(KCFG)" "-headers" -#ifneq "$(KCFG)" "-rpi" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch -#endif endif # Disable pcspeaker autoload @@ -161,6 +159,7 @@ ifeq "$(KCFG)" "-kirkwood" endif ifeq "$(KCFG)" "-multi" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0001-panda-wlan-fix.patch # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-0002-panda-i2c.patch # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-panda-reboot.patch diff --git a/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch b/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch new file mode 100644 index 0000000000..a829790951 --- /dev/null +++ b/src/patches/linux-3.10.27-fs-exec-atomic64-operand-requires-impossible-reload.patch @@ -0,0 +1,11 @@ +--- a/fs/Makefile.orig 2014-01-16 20:17:03.000000000 +0000 ++++ b/fs/Makefile 2014-01-16 20:25:05.000000000 +0000 +@@ -13,6 +13,8 @@ + pnode.o splice.o sync.o utimes.o \ + stack.o fs_struct.o statfs.o + ++CFLAGS_exec.o += -O1 ++ + ifeq ($(CONFIG_BLOCK),y) + obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o + else -- 2.39.2