[kernel] r5552 - in people/waldi/linux-2.6: . debian/arch debian/arch/i386 debian/arch/s390 debian/bin

[Bastian Blank]

Author: waldi
Date: Sat Jan 21 19:08:59 2006
New Revision: 5552

Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/config
   people/waldi/linux-2.6/debian/arch/i386/config
   people/waldi/linux-2.6/debian/arch/i386/config.486
   people/waldi/linux-2.6/debian/arch/i386/config.686
   people/waldi/linux-2.6/debian/arch/i386/config.k7
   people/waldi/linux-2.6/debian/arch/s390/config
   people/waldi/linux-2.6/debian/bin/gencontrol.py
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config	(original)
+++ people/waldi/linux-2.6/debian/arch/config	Sat Jan 21 19:08:59 2006
@@ -816,3 +816,5 @@
 # CONFIG_DEBUG_MUTEXES is not set
 CONFIG_MTD_DATAFLASH=m
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_BROKEN is not set
+# CONFIG_BROKEN_ON_SMP is not set

Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config	Sat Jan 21 19:08:59 2006
@@ -3,8 +3,6 @@
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 # CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
-CONFIG_BROKEN_ON_SMP=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_EMBEDDED=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.486
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.486	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.486	Sat Jan 21 19:08:59 2006
@@ -110,3 +110,4 @@
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_WP_WORKS_OK=y
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.686	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.686	Sat Jan 21 19:08:59 2006
@@ -84,3 +84,4 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.k7	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.k7	Sat Jan 21 19:08:59 2006
@@ -85,3 +85,4 @@
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+CONFIG_BROKEN_ON_SMP=y

Modified: people/waldi/linux-2.6/debian/arch/s390/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/config	(original)
+++ people/waldi/linux-2.6/debian/arch/s390/config	Sat Jan 21 19:08:59 2006
@@ -27,7 +27,7 @@
 CONFIG_CMM=y
 CONFIG_CMM_PROC=y
 CONFIG_VIRT_TIMER=y
-# CONFIG_VIRT_CPU_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_APPLDATA_BASE=y
 CONFIG_APPLDATA_MEM=m
 CONFIG_APPLDATA_OS=m
@@ -169,10 +169,13 @@
 # CONFIG_PROFILING is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=17
-CONFIG_CRYPTO_SHA1_Z990=m
-CONFIG_CRYPTO_DES_Z990=m
+CONFIG_CRYPTO_SHA1_S390=m
+CONFIG_CRYPTO_SHA256_S390=m
+CONFIG_CRYPTO_DES_S390=m
+CONFIG_CRYPTO_AES_S390=m
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=m
 CONFIG_KEXEC=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set
+# CONFIG_MAGIC_SYSRQ is not set

Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sat Jan 21 19:08:59 2006
@@ -40,7 +40,7 @@
         # Append this here so it only occurs on the install-headers-all line
 #        makeflags_string += " FLAVOURS='%s' " % ' '.join(['%s' % i for i in config_entry['flavours']])
         cmds_binary_arch = []
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(["%s (= %s)" % (i, self.version['source']) for i in extra['headers_arch_depends']]), makeflags_string),))
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(extra['headers_arch_depends']), makeflags_string),))
         makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
 
     def do_subarch_makeflags(self, makeflags, arch, subarch):