From ad73e5ec63d946dfd8c2c2543d74778391aabc58 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 18 Jun 2017 10:28:20 +0200 Subject: [PATCH] kernel: rpi build fix Signed-off-by: Arne Fitzenreiter --- lfs/linux | 1 + .../linux/linux-3.14.79-rpi-suspend-not-inline.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch diff --git a/lfs/linux b/lfs/linux index 270166c8b3..2900c99005 100644 --- a/lfs/linux +++ b/lfs/linux @@ -238,6 +238,7 @@ endif ifeq "$(KCFG)" "-rpi" # Apply Raspberry Pi kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch endif ifeq "$(KCFG)" "-headers" diff --git a/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch b/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch new file mode 100644 index 0000000000..da7cf802db --- /dev/null +++ b/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.14.79.ORG/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.14.79/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.14.79.ORG/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2017-06-16 19:58:56.000000000 +0200 ++++ linux-3.14.79/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2017-06-17 09:32:51.645096482 +0200 +@@ -1776,7 +1776,7 @@ + ** VC_RESUME_FAILED - Currently unused - no mechanism to fail resume exists. + */ + +-inline void ++void + set_suspend_state(VCHIQ_ARM_STATE_T *arm_state, + enum vc_suspend_status new_state) + { -- 2.39.5