ocf-linux: tweak kernel patch for newer kernels

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>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/linux/linux-ext-ocf-linux.mk b/linux/linux-ext-ocf-linux.mk
index faf7360e4964fdd46d9a2f45709f4b2678e50581..1a601d58cfc96fa3c59a52b229d5123f72780c60 100644 (file)
--- 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