From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ad73e5ec63d946dfd8c2c2543d74778391aabc58
Date: Sun, 18 Jun 2017 09:33:22 +0100 [thread overview]
Message-ID: <20170618083323.77DF91078E83@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2604 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via ad73e5ec63d946dfd8c2c2543d74778391aabc58 (commit)
from 6af04bf600666cf8462df931d2fd6e5f4673ef9b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ad73e5ec63d946dfd8c2c2543d74778391aabc58
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jun 18 10:28:20 2017 +0200
kernel: rpi build fix
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 1 +
src/patches/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
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 270166c..2900c99 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 0000000..da7cf80
--- /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)
+ {
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2017-06-18 8:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170618083323.77DF91078E83@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox