diff --git a/kernel/kernel-rt/centos/build_srpm.data b/kernel/kernel-rt/centos/build_srpm.data index dab446664..2ed119b61 100644 --- a/kernel/kernel-rt/centos/build_srpm.data +++ b/kernel/kernel-rt/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST="files/*" -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 BUILD_IS_BIG=11 BUILD_IS_SLOW=12 diff --git a/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra b/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra index b68811bcb..46300ed46 100644 --- a/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra +++ b/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra @@ -959,3 +959,6 @@ CONFIG_LOCK_TORTURE_TEST=n # Disable kernel memory accounting, which is broken CONFIG_MEMCG_KMEM=n +# Needed for opae fpga kernel module +# as it turns on hidden option REGMAP_MMIO +CONFIG_MFD_SYSCON=y diff --git a/kernel/kernel-std/centos/build_srpm.data b/kernel/kernel-std/centos/build_srpm.data index c06f85d68..dab446664 100644 --- a/kernel/kernel-std/centos/build_srpm.data +++ b/kernel/kernel-std/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST="files/*" -TIS_PATCH_VER=1 +TIS_PATCH_VER=2 BUILD_IS_BIG=11 BUILD_IS_SLOW=12 diff --git a/kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra b/kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra index d3c5982a9..59dcb2596 100644 --- a/kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra +++ b/kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra @@ -814,3 +814,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # Disable kernel memory accounting, which is broken CONFIG_MEMCG_KMEM=n + +# Needed for opae fpga kernel module +# as it turns on hidden option REGMAP_MMIO +CONFIG_MFD_SYSCON=y