- fixed imq_nf_hook definition

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index 88f725a7c0ad29ae96cf35ee1db4001b1987c10f..1ec514077e81e09191ad0be718b906468c5163c8 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -23,6 +23,7 @@ X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
+X86_GOLDFISH all=n
 X86_WANT_INTEL_MID i486=n i586=n i686=n
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
@@ -34,14 +35,14 @@ X86_SUMMIT i386=n
 X86_ES7000 i386=n
 X86_32_IRIS i486=y i586=y i686=y
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
-PARAVIRT_GUEST x86=y
-PARAVIRT_TIME_ACCOUNTING x86=y
+HYPERVISOR_GUEST all=y
+PARAVIRT x86=y
+PARAVIRT_DEBUG x86=n
+PARAVIRT_SPINLOCKS x86=n
 #- file arch/x86/xen/Kconfig goes here
 KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
-PARAVIRT x86=y
-PARAVIRT_SPINLOCKS x86=n
-PARAVIRT_DEBUG x86=n
+PARAVIRT_TIME_ACCOUNTING x86=y
 NO_BOOTMEM x86=y
 MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
@@ -51,7 +52,7 @@ GART_IOMMU x86_64=y
 CALGARY_IOMMU x86_64=y
 CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
 MAXSMP i386=n x86_64=n
-NR_CPUS x86=32
+NR_CPUS i386=32 x86_64=512
 SCHED_SMT x86=y
 SCHED_MC x86=y
 #- file kernel/Kconfig.preempt goes here
@@ -219,7 +220,6 @@ IO_DELAY_NONE x86=n
 DEBUG_BOOT_PARAMS x86=n
 CPA_DEBUG x86=n
 OPTIMIZE_INLINING x86=n
-DEBUG_STRICT_USER_COPY_CHECKS x86=n
 DEBUG_NMI_SELFTEST all=y
 
 #-
@@ -355,6 +355,7 @@ SPARSE_IRQ i386=y x86_64=y
 #-
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
+DEBUG_STRICT_USER_COPY_CHECKS x86=n
 #- file mm/Kconfig.debug goes here
 #- file kernel/trace/Kconfig goes here
 #- file samples/Kconfig goes here
@@ -368,4 +369,5 @@ EARLY_PRINTK_MRST x86=n
 KVM_CLOCK x86=y
 M386 i386=y i486=n i586=n i686=n pentium3=n pentium4=n athlon=n
 MCA i386=y
+PARAVIRT_GUEST x86=y
 X86_MRST i386=y