debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

bfa,bna: Replace large udelay() with mdelay() (fixes FTBFS on arm) (Closes: #741142) 

svn path=/dists/trunk/linux/; revision=21134
This commit is contained in:
Ben Hutchings 2014-03-09 04:09:57 +00:00
parent 34ac455b49
commit 5605d9f15a
4 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Sun, 09 Mar 2014 04:08:15 +0000
linux (3.14~rc5-1~exp1) experimental; urgency=medium
* New upstream release candidate

30
debian/patches/bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch vendored Normal file
View File

@ -0,0 +1,30 @@
From: Ben Hutchings <ben@decadent.org.uk>
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 <vagrant@debian.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
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;
}

30
debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch vendored Normal file
View File

@ -0,0 +1,30 @@
From: Ben Hutchings <ben@decadent.org.uk>
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 <vagrant@debian.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
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;
}

2
debian/patches/series vendored
View File

@ -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