@@ -164,7 +164,7 @@ CONFIG_CGROUP_PERF=y

 CONFIG_CGROUP_SCHED=y

 CONFIG_FAIR_GROUP_SCHED=y

 CONFIG_CFS_BANDWIDTH=y

-CONFIG_RT_GROUP_SCHED=y

+# CONFIG_RT_GROUP_SCHED is not set

 CONFIG_BLK_CGROUP=y

 # CONFIG_DEBUG_BLK_CGROUP is not set

 CONFIG_CGROUP_WRITEBACK=y

@@ -158,7 +158,7 @@ CONFIG_CGROUP_PERF=y

 CONFIG_CGROUP_SCHED=y

 CONFIG_FAIR_GROUP_SCHED=y

 CONFIG_CFS_BANDWIDTH=y

-CONFIG_RT_GROUP_SCHED=y

+# CONFIG_RT_GROUP_SCHED is not set

 CONFIG_BLK_CGROUP=y

 # CONFIG_DEBUG_BLK_CGROUP is not set

 CONFIG_CGROUP_WRITEBACK=y

new file mode 100644

@@ -0,0 +1,42 @@

+Users report that under VMWare, er32(TIMINCA) returns zero.

+This causes division by zero at init time as follows:

+

+ ==>            incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK;

+                for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) {

+                        /* latch SYSTIMH on read of SYSTIML */

+                        systim_next = (cycle_t)er32(SYSTIML);

+                        systim_next |= (cycle_t)er32(SYSTIMH) << 32;

+                        time_delta = systim_next - systim;

+                        temp = time_delta;

+ ====>                  rem = do_div(temp, incvalue);

+This change makes kernel survive this, and users report that

+NIC does work after this change.

+

+Since on real hardware incvalue is never zero, this should not affect

+real hardware use case.

+

+Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

+CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

+CC: "Ruinskiy, Dima" <dima.ruinskiy@intel.com>

+CC: intel-wired-lan@lists.osuosl.org

+CC: netdev@vger.kernel.org

+CC: LKML <linux-kernel@vger.kernel.org>

+---

+ drivers/net/ethernet/intel/e1000e/netdev.c | 3 ++-

+ 1 file changed, 2 insertions(+), 1 deletion(-)

+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c

+index 269087c..0626935 100644

+--- a/drivers/net/ethernet/intel/e1000e/netdev.c

+@@ -4315,7 +4315,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)

+ 

+ 			time_delta = systim_next - systim;

+ 			temp = time_delta;

+-			rem = do_div(temp, incvalue);

++			/* VMWare users have seen incvalue of zero, don't div / 0 */

++			rem = incvalue ? do_div(temp, incvalue) : (time_delta != 0);

+ 

+ 			systim = systim_next;

+ 

+-- 

+1.8.1.4

@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.4.8

-Release:       5%{?dist}

+Release:       6%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -27,6 +27,7 @@ Patch11:       netfilter-x_tables-deal-with-bogus-nextoffset-values.patch

 #fixes CVE-2016-3135

 Patch12:       netfilter-x_tables-check-for-size-overflow.patch

 Patch13:       REVERT-sched-fair-Beef-up-wake_wide.patch

+Patch14:       e1000e-prevent-div-by-zero-if-TIMINCA-is-zero.patch

 BuildRequires: bc 

 BuildRequires: kbd

 BuildRequires: kmod

@@ -75,6 +76,7 @@ The Linux package contains the Linux kernel doc files

 %patch11 -p1

 %patch12 -p1

 %patch13 -p1

+%patch14 -p1

 %build

 make mrproper

@@ -140,6 +142,9 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Fri Jun 17 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-6

+-   patch: e1000e-prevent-div-by-zero-if-TIMINCA-is-zero.patch

+-   .config: disable rt group scheduling - not supported by systemd

 *   Fri May 27 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-5

 -   patch: REVERT-sched-fair-Beef-up-wake_wide.patch

 *   Wed May 25 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-4

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:    	4.4.8

-Release:    	7%{?dist}

+Release:    	8%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -23,6 +23,7 @@ Patch7:		netfilter-x_tables-deal-with-bogus-nextoffset-values.patch

 #fixes CVE-2016-3135

 Patch8:		netfilter-x_tables-check-for-size-overflow.patch

 Patch9:		REVERT-sched-fair-Beef-up-wake_wide.patch

+Patch10:	e1000e-prevent-div-by-zero-if-TIMINCA-is-zero.patch

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod

@@ -88,6 +89,7 @@ Kernel driver for oprofile, a statistical profiler for Linux systems

 %patch7 -p1

 %patch8 -p1

 %patch9 -p1

+%patch10 -p1

 %build

 make mrproper

@@ -184,8 +186,11 @@ ln -s /usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}.debug /boot/vmlin

 /lib/modules/%{version}/kernel/arch/x86/oprofile/

 %changelog

-*	Wed Jun 15 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.8-7

--	fixed the capitalization for - System.map 

+*   Fri Jun 17 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-8

+-   patch: e1000e-prevent-div-by-zero-if-TIMINCA-is-zero.patch

+-   .config: disable rt group scheduling - not supported by systemd

+*   Wed Jun 15 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.8-7

+-   fixed the capitalization for - System.map 

 *   Thu May 26 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-6

 -   patch: REVERT-sched-fair-Beef-up-wake_wide.patch

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.8-5