packages: kernel/kernel-x86.config, kernel/kernel-multiarch.config - option...

[sparky]

Author: sparky                       Date: Fri Dec  4 20:23:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- options which belong to arch/x86 moved from multiarch.config to x86.config

---- Files affected:
packages/kernel:
   kernel-x86.config (1.17 -> 1.18) , kernel-multiarch.config (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.17 packages/kernel/kernel-x86.config:1.18
--- packages/kernel/kernel-x86.config:1.17	Fri Dec  4 21:07:28 2009
+++ packages/kernel/kernel-x86.config	Fri Dec  4 21:23:49 2009
@@ -4,6 +4,7 @@
 #-
 OPROFILE x86=m
 OPROFILE_IBS x86=n
+OPROFILE_EVENT_MULTIPLEX all=n
 KPROBES x86=y
 #- file kernel/gcov/Kconfig goes here
 
@@ -22,6 +23,7 @@
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_ELAN i386=n
+X86_MRST all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
@@ -53,6 +55,7 @@
 X86_MCE_INTEL x86_64=y i686=y
 X86_MCE_AMD x86_64=y i686=y
 X86_ANCIENT_MCE i686=y
+X86_MCE_INJECT all=m
 VM86 i386=y
 TOSHIBA i386=m
 I8K x86=m
@@ -187,9 +190,12 @@
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 X86_PTDUMP x86=n
+DEBUG_RODATA all=y
+DEBUG_RODATA_TEST all=n
 DEBUG_NX_TEST x86=m
 4KSTACKS i386=n
 IOMMU_DEBUG x86_64=n
+IOMMU_STRESS all=n
 IO_DELAY_0X80 x86=y
 IO_DELAY_0XED x86=n
 IO_DELAY_UDELAY x86=n

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.23 packages/kernel/kernel-multiarch.config:1.24
--- packages/kernel/kernel-multiarch.config:1.23	Fri Dec  4 21:19:53 2009
+++ packages/kernel/kernel-multiarch.config	Fri Dec  4 21:23:49 2009
@@ -1,15 +1,5 @@
 
 #-
-#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
-#-
-DEBUG_RODATA all=y
-DEBUG_RODATA_TEST all=n
-IOMMU_STRESS all=n
-OPROFILE_EVENT_MULTIPLEX all=n
-X86_MCE_INJECT all=m
-X86_MRST all=y
-
-#-
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.23&r2=1.24&f=u