Patchwork ocf-linux: tweak kernel patch for newer kernels

login
register
mail settings
Submitter Gustavo Zacarias
Date Nov. 27, 2012, 7:23 p.m.
Message ID <1354044188-23646-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/202285/
State Accepted
Commit 670d60dc919fe6d99224ad1056c426812b38d108
Headers show

Comments

Gustavo Zacarias - Nov. 27, 2012, 7:23 p.m.
Newer kernels had a slight change in the random number API so the OCF
patchset requires a slight tweak to build and run properly.

Affected kernels are, per series:
>=3.0.41, >=3.2.29, >=3.4.9, >=3.5.2 and any newer version.

The fix is applied by detecting the API change rather than guessing the
kernel version.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 linux/linux-ext-ocf-linux.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Peter Korsgaard - Nov. 28, 2012, 1:06 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Newer kernels had a slight change in the random number API so the OCF
 Gustavo> patchset requires a slight tweak to build and run properly.

Committed, thanks.

Patch

diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk
index faf7360..1a601d5 100644
--- a/linux/linux-ext-ocf-linux.mk
+++ b/linux/linux-ext-ocf-linux.mk
@@ -15,6 +15,8 @@  LINUX_DEPENDENCIES += ocf-linux
 define OCF_LINUX_PREPARE_KERNEL
 	support/scripts/apply-patches.sh $(LINUX_DIR) \
 		$(OCF_LINUX_DIR)/patches/ linux-3.2.1-ocf.patch ; \
+	grep -q __mix_pool_bytes $(LINUX_DIR)/drivers/char/random.c && \
+	$(SED) 's:wordcount\*4:&, NULL:' $(LINUX_DIR)/drivers/char/random.c ; \
 	cp -rf $(OCF_LINUX_DIR)/ocf $(LINUX_DIR)/crypto/ocf ;
 endef