[kernel] r22208 - in dists/sid/linux/debian: . config/armel

[Ian James Campbell]

Author: ijc
Date: Fri Dec 19 08:54:25 2014
New Revision: 22208

Log:
[armel/kirkwood] Disable CRYPTO_FIPS

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/armel/config.kirkwood
   dists/sid/linux/debian/config/armel/defines

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Dec 19 08:54:22 2014	(r22207)
+++ dists/sid/linux/debian/changelog	Fri Dec 19 08:54:25 2014	(r22208)
@@ -21,6 +21,7 @@
     - [/kirkwood] mm: Disable KSM
     - [/kirkwood] Disable CHECKPOINT_RESTORE
     - [/kirkwood] Disable ZSMALLOC
+    - [/kirkwood] Disable CRYPTO_FIPS
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 

Modified: dists/sid/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux/debian/config/armel/config.kirkwood	Fri Dec 19 08:54:22 2014	(r22207)
+++ dists/sid/linux/debian/config/armel/config.kirkwood	Fri Dec 19 08:54:25 2014	(r22208)
@@ -79,6 +79,11 @@
 CONFIG_SUN_PARTITION=y
 
 ##
+## file: crypto/Kconfig
+##
+# CONFIG_CRYPTO_FIPS is not set
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m

Modified: dists/sid/linux/debian/config/armel/defines
==============================================================================
--- dists/sid/linux/debian/config/armel/defines	Fri Dec 19 08:54:22 2014	(r22207)
+++ dists/sid/linux/debian/config/armel/defines	Fri Dec 19 08:54:25 2014	(r22208)
@@ -50,6 +50,7 @@
  zs_malloc
  zs_map_object
  zs_unmap_object
+ fips_enabled
 
 [orion5x_description]
 hardware: Marvell Orion