fix the CRYPTO_DEV_HIFN_795X issue for good
svn path=/dists/trunk/linux-2.6/; revision=10665
This commit is contained in:
parent
8117a07343
commit
6c76f4d048
|
@ -36,7 +36,6 @@ iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
|
|||
TS-109/TS-209.
|
||||
* [arm] Pad the SSB structure so crossing-compiling a kernel for ARM
|
||||
won't fail because of sanity checks; patch from Gordon Farquharson.
|
||||
* [arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile.
|
||||
|
||||
[ Daniel Baumann ]
|
||||
* Added patch from unionfs upstream to export release_open_intent symbol.
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
Building modules, stage 2.
|
||||
MODPOST 759 modules
|
||||
ERROR: "__divdi3" [drivers/crypto/hifn_795x.ko] undefined!
|
||||
|
||||
--- a/drivers/crypto/Kconfig 2008-02-26 09:14:14.000000000 +0000
|
||||
+++ b/drivers/crypto/Kconfig 2008-02-26 09:15:11.000000000 +0000
|
||||
@@ -149,6 +149,7 @@
|
||||
select CRYPTO_BLKCIPHER
|
||||
select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG
|
||||
depends on PCI
|
||||
+ depends on (!MIPS && !ARM) || BROKEN
|
||||
help
|
||||
This option allows you to have support for HIFN 795x crypto adapters.
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
On Tue, Feb 26, 2008 at 01:21:00PM +0100, Martin Michlmayr wrote:
|
||||
> With 2.6.25-rc3 and a config file with
|
||||
>
|
||||
> CONFIG_CRYPTO_DEV_HIFN_795X=m
|
||||
> CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
|
||||
>
|
||||
> I get the following build error on at least ARM and MIPS:
|
||||
>
|
||||
> Building modules, stage 2.
|
||||
> MODPOST 759 modules
|
||||
> ERROR: "__divdi3" [drivers/crypto/hifn_795x.ko] undefined!
|
||||
|
||||
Fix below.
|
||||
|
||||
> Martin Michlmayr
|
||||
|
||||
cu
|
||||
Adrian
|
||||
|
||||
|
||||
<-- snip -->
|
||||
|
||||
|
||||
Using ndelay() with a 64bit variable as parameter can result in build
|
||||
errors like the following on some 32bit systems when it results in a
|
||||
64bit division:
|
||||
|
||||
<-- snip -->
|
||||
|
||||
...
|
||||
MODPOST 759 modules
|
||||
ERROR: "__divdi3" [drivers/crypto/hifn_795x.ko] undefined!
|
||||
|
||||
<-- snip -->
|
||||
|
||||
Reported by Martin Michlmayr.
|
||||
|
||||
Signed-off-by: Adrian Bunk <bunk@kernel.org>
|
||||
|
||||
---
|
||||
|
||||
40b45041ddc587c20b872a86a6a36952c28b02c7 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
|
||||
index 3110bf7..b1541c6 100644
|
||||
--- a/drivers/crypto/hifn_795x.c
|
||||
+++ b/drivers/crypto/hifn_795x.c
|
||||
@@ -807,7 +807,7 @@ static int hifn_rng_data_present(struct hwrng *rng, int wait)
|
||||
return 1;
|
||||
if (!wait)
|
||||
return 0;
|
||||
- ndelay(nsec);
|
||||
+ ndelay((u32)nsec);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -31,4 +31,4 @@
|
|||
+ features/all/at76.patch
|
||||
+ bugfix/arm/ignore-invalid-memtags.patch
|
||||
+ bugfix/arm/pad-ssb-structure.patch
|
||||
+ bugfix/disable-hifn_795X.patch
|
||||
+ bugfix/fix-hifn_795X-divdi3.patch
|
||||
|
|
Loading…
Reference in New Issue