Attachment 156749 Details for Bug 298944

diff (default vs. bigsmp)

config.diff (text/x-patch), 6.02 KB, created by Timo Hoenig on 2007-08-10 10:36:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timo Hoenig

Created: 2007-08-10 10:36:15 UTC

Size: 6.02 KB

patch

obsolete

>--- default	2007-08-10 09:35:23.000000000 +0200
>+++ bigsmp	2007-08-10 09:35:23.000000000 +0200
>@@ -31,8 +31,8 @@
> #
> # General setup
> #
>-CONFIG_LOCALVERSION="-default"
>-# CONFIG_LOCALVERSION_AUTO is not set
>+CONFIG_LOCALVERSION="-bigsmp"
>+CONFIG_LOCALVERSION_AUTO=y
> CONFIG_SUSE_KERNEL=y
> CONFIG_SWAP=y
> CONFIG_SYSVIPC=y
>@@ -172,12 +172,13 @@
> CONFIG_X86_INVLPG=y
> CONFIG_X86_BSWAP=y
> CONFIG_X86_POPAD_OK=y
>+CONFIG_X86_CMPXCHG64=y
> CONFIG_X86_ALIGNMENT_16=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_MINIMUM_CPU_MODEL=4
> CONFIG_HPET_TIMER=y
> CONFIG_HPET_EMULATE_RTC=y
>-CONFIG_NR_CPUS=32
>+CONFIG_NR_CPUS=128
> CONFIG_SCHED_SMT=y
> CONFIG_SCHED_MC=y
> # CONFIG_PREEMPT_NONE is not set
>@@ -187,7 +188,7 @@
> CONFIG_X86_LOCAL_APIC=y
> CONFIG_X86_IO_APIC=y
> CONFIG_X86_MCE=y
>-CONFIG_X86_MCE_NONFATAL=y
>+# CONFIG_X86_MCE_NONFATAL is not set
> CONFIG_X86_MCE_P4THERMAL=y
> CONFIG_VM86=y
> CONFIG_TOSHIBA=m
>@@ -207,10 +208,12 @@
> CONFIG_DCDBAS=m
> CONFIG_DMIID=y
> # CONFIG_NOHIGHMEM is not set
>-CONFIG_HIGHMEM4G=y
>-# CONFIG_HIGHMEM64G is not set
>+# CONFIG_HIGHMEM4G is not set
>+CONFIG_HIGHMEM64G=y
> CONFIG_PAGE_OFFSET=0xC0000000
> CONFIG_HIGHMEM=y
>+CONFIG_X86_PAE=y
>+# CONFIG_NUMA is not set
> CONFIG_ARCH_POPULATES_NODE_MAP=y
> CONFIG_SELECT_MEMORY_MODEL=y
> CONFIG_FLATMEM_MANUAL=y
>@@ -220,7 +223,7 @@
> CONFIG_FLAT_NODE_MEM_MAP=y
> # CONFIG_SPARSEMEM_STATIC is not set
> CONFIG_SPLIT_PTLOCK_CPUS=4
>-# CONFIG_RESOURCES_64BIT is not set
>+CONFIG_RESOURCES_64BIT=y
> CONFIG_ZONE_DMA_FLAG=1
> CONFIG_NR_QUICK=1
> CONFIG_HIGHPTE=y
>@@ -250,8 +253,7 @@
> CONFIG_PM_LEGACY=y
> # CONFIG_PM_DEBUG is not set
> # CONFIG_PM_SYSFS_DEPRECATED is not set
>-CONFIG_SOFTWARE_SUSPEND=y
>-CONFIG_PM_STD_PARTITION=""
>+# CONFIG_SOFTWARE_SUSPEND is not set
> CONFIG_SUSPEND_SMP=y
> 
> #
>@@ -262,29 +264,27 @@
> CONFIG_ACPI_SLEEP_PROC_FS=y
> CONFIG_ACPI_SLEEP_PROC_SLEEP=y
> CONFIG_ACPI_PROCFS=y
>-CONFIG_ACPI_AC=m
>-CONFIG_ACPI_BATTERY=m
>+# CONFIG_ACPI_AC is not set
>+# CONFIG_ACPI_BATTERY is not set
> CONFIG_ACPI_BUTTON=m
>-CONFIG_ACPI_VIDEO=m
>+# CONFIG_ACPI_VIDEO is not set
> CONFIG_ACPI_FAN=m
>-CONFIG_ACPI_DOCK=m
>-CONFIG_ACPI_BAY=m
>+# CONFIG_ACPI_DOCK is not set
> CONFIG_ACPI_PROCESSOR=m
> CONFIG_ACPI_HOTPLUG_CPU=y
> CONFIG_ACPI_THERMAL=m
> # CONFIG_ACPI_ASUS is not set
>-CONFIG_ACPI_TOSHIBA=m
>+# CONFIG_ACPI_TOSHIBA is not set
> # CONFIG_ACPI_CUSTOM_DSDT is not set
> CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
> CONFIG_ACPI_BLACKLIST_YEAR=2001
>-CONFIG_ACPI_DEBUG=y
>-# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
>+# CONFIG_ACPI_DEBUG is not set
> CONFIG_ACPI_EC=y
> CONFIG_ACPI_POWER=y
> CONFIG_ACPI_SYSTEM=y
> CONFIG_X86_PM_TIMER=y
> CONFIG_ACPI_CONTAINER=m
>-CONFIG_ACPI_SBS=m
>+# CONFIG_ACPI_SBS is not set
> CONFIG_APM=m
> # CONFIG_APM_IGNORE_USER_SUSPEND is not set
> CONFIG_APM_DO_ENABLE=y
>@@ -402,7 +402,7 @@
> CONFIG_HOTPLUG_PCI_CPCI=y
> CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
> CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
>-CONFIG_HOTPLUG_PCI_SHPC=m
>+# CONFIG_HOTPLUG_PCI_SHPC is not set
> 
> #
> # Executable file formats
>@@ -1182,13 +1182,10 @@
> # CONFIG_SGI_IOC4 is not set
> CONFIG_TIFM_CORE=m
> CONFIG_TIFM_7XX1=m
>-CONFIG_ASUS_LAPTOP=m
>-CONFIG_MSI_LAPTOP=m
>-CONFIG_SONY_LAPTOP=m
>-CONFIG_SONYPI_COMPAT=y
>-CONFIG_THINKPAD_ACPI=m
>-# CONFIG_THINKPAD_ACPI_DEBUG is not set
>-CONFIG_THINKPAD_ACPI_BAY=y
>+# CONFIG_ASUS_LAPTOP is not set
>+# CONFIG_MSI_LAPTOP is not set
>+# CONFIG_SONY_LAPTOP is not set
>+# CONFIG_THINKPAD_ACPI is not set
> CONFIG_IDE=m
> CONFIG_BLK_DEV_IDE=m
> 
>@@ -1553,8 +1550,9 @@
> CONFIG_I2O=m
> CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
> CONFIG_I2O_EXT_ADAPTEC=y
>+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
> CONFIG_I2O_CONFIG=m
>-CONFIG_I2O_CONFIG_OLD_IOCTL=y
>+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
> CONFIG_I2O_BUS=m
> CONFIG_I2O_BLOCK=m
> CONFIG_I2O_SCSI=m
>@@ -1575,11 +1573,13 @@
> CONFIG_ARCNET_1201=m
> CONFIG_ARCNET_1051=m
> CONFIG_ARCNET_RAW=m
>-CONFIG_ARCNET_CAP=m
>+# CONFIG_ARCNET_CAP is not set
> CONFIG_ARCNET_COM90xx=m
> CONFIG_ARCNET_COM90xxIO=m
> CONFIG_ARCNET_RIM_I=m
>-# CONFIG_ARCNET_COM20020 is not set
>+CONFIG_ARCNET_COM20020=m
>+CONFIG_ARCNET_COM20020_ISA=m
>+CONFIG_ARCNET_COM20020_PCI=m
> CONFIG_PHYLIB=m
> 
> #
>@@ -1702,7 +1702,7 @@
> CONFIG_HAMACHI=m
> CONFIG_YELLOWFIN=m
> CONFIG_R8169=m
>-CONFIG_R8169_NAPI=y
>+# CONFIG_R8169_NAPI is not set
> CONFIG_R8169_VLAN=y
> CONFIG_SIS190=m
> CONFIG_SKGE=m
>@@ -1826,6 +1826,7 @@
> CONFIG_PCMCIA_SMC91C92=m
> CONFIG_PCMCIA_XIRC2PS=m
> CONFIG_PCMCIA_AXNET=m
>+CONFIG_ARCNET_COM20020_CS=m
> CONFIG_PCMCIA_IBMTR=m
> CONFIG_WAN=y
> CONFIG_HOSTESS_SV11=m
>@@ -1841,12 +1842,23 @@
> CONFIG_HDLC_X25=m
> CONFIG_PCI200SYN=m
> CONFIG_WANXL=m
>-# CONFIG_PC300 is not set
>+CONFIG_PC300=m
>+CONFIG_PC300_MLPPP=y
>+
>+#
>+# Cyclades-PC300 MLPPP support is disabled.
>+#
>+
>+#
>+# Refer to the file README.mlppp, provided by PC300 package.
>+#
> CONFIG_PC300TOO=m
> CONFIG_N2=m
> CONFIG_C101=m
> CONFIG_FARSYNC=m
>-# CONFIG_DSCC4 is not set
>+CONFIG_DSCC4=m
>+CONFIG_DSCC4_PCISYNC=y
>+CONFIG_DSCC4_PCI_RST=y
> CONFIG_DLCI=m
> CONFIG_DLCI_MAX=8
> CONFIG_SDLA=m
>@@ -2365,7 +2377,7 @@
> CONFIG_SYNCLINK_CS=m
> CONFIG_CARDMAN_4000=m
> CONFIG_CARDMAN_4040=m
>-CONFIG_MWAVE=m
>+# CONFIG_MWAVE is not set
> CONFIG_SCx200_GPIO=m
> CONFIG_PC8736x_GPIO=m
> CONFIG_NSC_GPIO=m
>@@ -2608,7 +2620,6 @@
> CONFIG_VIDEO_ZORAN_LML33=m
> CONFIG_VIDEO_ZORAN_LML33R10=m
> CONFIG_VIDEO_ZORAN_AVS6EYES=m
>-CONFIG_VIDEO_MEYE=m
> CONFIG_VIDEO_SAA7134=m
> CONFIG_VIDEO_SAA7134_ALSA=m
> # CONFIG_VIDEO_SAA7134_OSS is not set
>@@ -3105,8 +3116,8 @@
> #
> # PCMCIA devices
> #
>-CONFIG_SND_VXPOCKET=m
>-CONFIG_SND_PDAUDIOCF=m
>+# CONFIG_SND_VXPOCKET is not set
>+# CONFIG_SND_PDAUDIOCF is not set
> 
> #
> # System on Chip audio support
>@@ -3545,7 +3556,7 @@
> CONFIG_GFS2_FS_LOCKING_NOLOCK=m
> CONFIG_GFS2_FS_LOCKING_DLM=m
> CONFIG_OCFS2_FS=m
>-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
>+CONFIG_OCFS2_DEBUG_MASKLOG=y
> CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
> CONFIG_MINIX_FS=y
> CONFIG_ROMFS_FS=m
>@@ -3631,7 +3642,7 @@
> CONFIG_SYSV_FS=m
> CONFIG_UFS_FS=m
> CONFIG_UFS_FS_WRITE=y
>-# CONFIG_UFS_DEBUG is not set
>+CONFIG_UFS_DEBUG=y
> 
> #
> # Network File Systems
>@@ -3799,10 +3810,6 @@
> CONFIG_EARLY_PRINTK=y
> CONFIG_DEBUG_STACKOVERFLOW=y
> # CONFIG_DEBUG_STACK_USAGE is not set
>-
>-#
>-# Page alloc debug is incompatible with Software Suspend on i386
>-#
> # CONFIG_DEBUG_RODATA is not set
> # CONFIG_4KSTACKS is not set
> CONFIG_X86_FIND_SMP_CONFIG=y

Actions: View

Attachments on bug 298944: 156749