From 5605d9f15a387fb5be152de0db817724f692a1b3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 9 Mar 2014 04:09:57 +0000 Subject: [PATCH] bfa,bna: Replace large udelay() with mdelay() (fixes FTBFS on arm) (Closes: #741142) svn path=/dists/trunk/linux/; revision=21134 --- debian/changelog | 7 +++++ ...bfa-Replace-large-udelay-with-mdelay.patch | 30 +++++++++++++++++++ ...bna-Replace-large-udelay-with-mdelay.patch | 30 +++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 69 insertions(+) create mode 100644 debian/patches/bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch create mode 100644 debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch diff --git a/debian/changelog b/debian/changelog index 3a1d88082..3ff4af8f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (3.14~rc5-1~exp2) UNRELEASED; urgency=medium + + * bfa,bna: Replace large udelay() with mdelay() (fixes FTBFS on arm) + (Closes: #741142) + + -- Ben Hutchings Sun, 09 Mar 2014 04:08:15 +0000 + linux (3.14~rc5-1~exp1) experimental; urgency=medium * New upstream release candidate diff --git a/debian/patches/bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch b/debian/patches/bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch new file mode 100644 index 000000000..5f73d1096 --- /dev/null +++ b/debian/patches/bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch @@ -0,0 +1,30 @@ +From: Ben Hutchings +Date: Sun, 9 Mar 2014 03:58:52 +0000 +Subject: bfa: Replace large udelay() with mdelay() +Bug-Debian: https://bugs.debian.org/741142 +Forwarded: http://mid.gmane.org/1394337858.2861.72.camel@deadeye.wl.decadent.org.uk + +udelay() does not work on some architectures for values above +2000, in particular on ARM: + +ERROR: "__bad_udelay" [drivers/scsi/bfa/bfa.ko] undefined! + +Reported-by: Vagrant Cascadian +Signed-off-by: Ben Hutchings +--- + drivers/scsi/bfa/bfa_ioc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c +index 65180e1..50c75e1 100644 +--- a/drivers/scsi/bfa/bfa_ioc.c ++++ b/drivers/scsi/bfa/bfa_ioc.c +@@ -7006,7 +7006,7 @@ bfa_flash_sem_get(void __iomem *bar) + while (!bfa_raw_sem_get(bar)) { + if (--n <= 0) + return BFA_STATUS_BADFLASH; +- udelay(10000); ++ mdelay(10); + } + return BFA_STATUS_OK; + } diff --git a/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch b/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch new file mode 100644 index 000000000..2a8da1380 --- /dev/null +++ b/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch @@ -0,0 +1,30 @@ +From: Ben Hutchings +Date: Sun, 9 Mar 2014 03:58:52 +0000 +Subject: bna: Replace large udelay() with mdelay() +Bug-Debian: https://bugs.debian.org/741142 +Forwarded: http://mid.gmane.org/1394337802.2861.71.camel@deadeye.wl.decadent.org.uk + +udelay() does not work on some architectures for values above +2000, in particular on ARM: + +ERROR: "__bad_udelay" [drivers/net/ethernet/brocade/bna/bna.ko] undefined! + +Reported-by: Vagrant Cascadian +Signed-off-by: Ben Hutchings +--- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c +index 1803c39..354ae97 100644 +--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c ++++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c +@@ -1704,7 +1704,7 @@ bfa_flash_sem_get(void __iomem *bar) + while (!bfa_raw_sem_get(bar)) { + if (--n <= 0) + return BFA_STATUS_BADFLASH; +- udelay(10000); ++ mdelay(10); + } + return BFA_STATUS_OK; + } diff --git a/debian/patches/series b/debian/patches/series index 197ed8b3b..9fe9002d9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -70,3 +70,5 @@ bugfix/all/bluetooth-allocate-static-minor-for-vhci.patch features/all/x86-memtest-WARN-if-bad-RAM-found.patch features/all/efi-autoload-efivars.patch features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch +bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch +bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch