aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/256-crypto_add_kconfig_prompts.patch
blob: 8462c711f02168fbcab88f668cf77aaec48ea634 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -31,7 +31,7 @@ config CRYPTO_FIPS
 	  this is.
 
 config CRYPTO_ALGAPI
-	tristate
+	tristate "ALGAPI"
 	select CRYPTO_ALGAPI2
 	help
 	  This option provides the API for cryptographic algorithms.
@@ -40,7 +40,7 @@ config CRYPTO_ALGAPI2
 	tristate
 
 config CRYPTO_AEAD
-	tristate
+	tristate "AEAD"
 	select CRYPTO_AEAD2
 	select CRYPTO_ALGAPI
 
@@ -49,7 +49,7 @@ config CRYPTO_AEAD2
 	select CRYPTO_ALGAPI2
 
 config CRYPTO_BLKCIPHER
-	tristate
+	tristate "BLKCIPHER"
 	select CRYPTO_BLKCIPHER2
 	select CRYPTO_ALGAPI
 
@@ -60,7 +60,7 @@ config CRYPTO_BLKCIPHER2
 	select CRYPTO_WORKQUEUE
 
 config CRYPTO_HASH
-	tristate
+	tristate "HASH"
 	select CRYPTO_HASH2
 	select CRYPTO_ALGAPI
 
@@ -69,7 +69,7 @@ config CRYPTO_HASH2
 	select CRYPTO_ALGAPI2
 
 config CRYPTO_RNG
-	tristate
+	tristate "RNG"
 	select CRYPTO_RNG2
 	select CRYPTO_ALGAPI
 
CORE_WATCHDOG needed to build 'mpcore_wdt' already depends on HAVE_ARM_TWD needed to build 'smp_twd', so from the point of view of 'mpcore_wdt' driver the exported function will always exist. Signed-off-by: Valentine Barshak <vbarshak@mvista.com> Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> --- arch/arm/include/asm/smp_twd.h | 1 + arch/arm/kernel/smp_twd.c | 7 +++++++ drivers/watchdog/mpcore_wdt.c | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) --- a/arch/arm/include/asm/smp_twd.h +++ b/arch/arm/include/asm/smp_twd.h @@ -33,6 +33,7 @@ struct twd_local_timer name __initdata = }; int twd_local_timer_register(struct twd_local_timer *); +unsigned long twd_timer_get_rate(void); #ifdef CONFIG_HAVE_ARM_TWD void twd_local_timer_of_register(void); --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -352,6 +352,13 @@ int __init twd_local_timer_register(stru return twd_local_timer_common_register(); } +/* Needed by mpcore_wdt */ +unsigned long twd_timer_get_rate(void) +{ + return twd_timer_rate; +} +EXPORT_SYMBOL_GPL(twd_timer_get_rate); + #ifdef CONFIG_OF const static struct of_device_id twd_of_match[] __initconst = { { .compatible = "arm,cortex-a9-twd-timer", }, --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c @@ -102,9 +102,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ - count = __raw_readl(wdt->base + TWD_WDOG_COUNTER); - count = (0xFFFFFFFFU - count) * (HZ / 5); - count = (count / 256) * mpcore_margin; + count = (twd_timer_get_rate() / 256) * mpcore_margin; /* Reload the counter */ writel(count + wdt->perturb, wdt->base + TWD_WDOG_LOAD);