Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Galbraith <mgalbraith@suse.de>2011-10-24 15:53:34 +0200
committerMike Galbraith <mgalbraith@suse.de>2011-10-24 15:53:34 +0200
commitb4e1548992b62ccdeefd7bead1acae9cdb01a7e6 (patch)
tree68d8fd9b540713e7db07203114bf0d51413247f2
parente67df5109a24ab03ee6fcd054b6e17234e3eebfd (diff)
parent290a68c56a2c668d225a32c0007e270de388a4cd (diff)
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.drivers/benet-32bit-fix30
-rw-r--r--series.conf1
3 files changed, 37 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 02219ff310..1bb071f3c7 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -19,6 +19,12 @@ Mon Oct 24 14:59:47 CEST 2011 - mgalbraith@suse.de
to wakeup preemption.
-------------------------------------------------------------------
+Mon Oct 24 14:01:57 CEST 2011 - mmarek@suse.cz
+
+- patches.drivers/benet-32bit-fix: benet: fix build error on
+ 32bit arch.
+
+-------------------------------------------------------------------
Mon Oct 24 11:23:33 CEST 2011 - ohering@suse.de
- patches.suse/staging-hv-pata_piix-ignore-disks.patch:
diff --git a/patches.drivers/benet-32bit-fix b/patches.drivers/benet-32bit-fix
new file mode 100644
index 0000000000..f7caf6e739
--- /dev/null
+++ b/patches.drivers/benet-32bit-fix
@@ -0,0 +1,30 @@
+From 3355f892bfe78d8e2aeddb982ca17cb3ad7af1a0 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <eric.dumazet@gmail.com>
+Date: Tue, 9 Aug 2011 06:23:07 +0000
+Subject: [PATCH] benet: fix build error on 32bit arch
+Patch-mainline: v3.2-rc1
+Git-commit: 68c3e5a7b91513010d2536e4bcd7bdd54d0e6acf
+
+Error comes from commit ac124ff973e27802797
+(be2net: cleanup and refactor stats code)
+
+ERROR: "__udivdi3" [drivers/net/benet/be2net.ko] undefined!
+
+Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
+CC: Sathya Perla <sathya.perla@emulex.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Michal Marek <mmarek@suse.cz>
+
+diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
+index 53023a9..ddedc77 100644
+--- a/drivers/net/benet/be_main.c
++++ b/drivers/net/benet/be_main.c
+@@ -955,7 +955,7 @@ static void be_rx_eqd_update(struct be_adapter *adapter, struct be_rx_obj *rxo)
+ pkts = stats->rx_pkts;
+ } while (u64_stats_fetch_retry_bh(&stats->sync, start));
+
+- stats->rx_pps = (pkts - stats->rx_pkts_prev) / (delta / HZ);
++ stats->rx_pps = (unsigned long)(pkts - stats->rx_pkts_prev) / (delta / HZ);
+ stats->rx_pkts_prev = pkts;
+ stats->rx_jiffies = now;
+ eqd = stats->rx_pps / 110000;
diff --git a/series.conf b/series.conf
index 60bc564cf5..aba31d1337 100644
--- a/series.conf
+++ b/series.conf
@@ -1120,6 +1120,7 @@
patches.drivers/0031-be2net-Modified-PCI-MaxReadReq-size-to-4096-bytes.patch
patches.drivers/0032-be2net-Making-die-temperature-ioctl-call-async.patch
patches.drivers/0033-be2net-Changed-version-to-4.1.227.patch
+ patches.drivers/benet-32bit-fix
patches.drivers/0217-e1000e-disable-far-end-loopback-mode-on-ESB2.patch
patches.drivers/0218-e1000e-82579-intermittently-disabled-during-S0-Sx.patch