Commit b531330c authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] parisc: update a500_defconfig

Enable SMP on A500 by default
Committed-by: default avatarPaul Bame <bame@parisc-linux.org>
parent b95a5c4e
...@@ -11,7 +11,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -11,7 +11,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
# CONFIG_CLEAN_COMPILE is not set # CONFIG_CLEAN_COMPILE is not set
# CONFIG_STANDALONE is not set
CONFIG_BROKEN=y CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
...@@ -31,6 +30,7 @@ CONFIG_IKCONFIG_PROC=y ...@@ -31,6 +30,7 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_EMBEDDED=y CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_NOOP=y
...@@ -48,6 +48,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y ...@@ -48,6 +48,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set # CONFIG_MODVERSIONS is not set
CONFIG_KMOD=y CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
# #
# Processor type and features # Processor type and features
...@@ -61,9 +62,12 @@ CONFIG_PA20=y ...@@ -61,9 +62,12 @@ CONFIG_PA20=y
CONFIG_PREFETCH=y CONFIG_PREFETCH=y
CONFIG_PARISC64=y CONFIG_PARISC64=y
CONFIG_64BIT=y CONFIG_64BIT=y
# CONFIG_SMP is not set CONFIG_SMP=y
CONFIG_HOTPLUG_CPU=y
# CONFIG_DISCONTIGMEM is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
CONFIG_COMPAT=y CONFIG_COMPAT=y
CONFIG_NR_CPUS=4
# #
# Bus options (PCI, PCMCIA, EISA, GSC, ISA) # Bus options (PCI, PCMCIA, EISA, GSC, ISA)
...@@ -86,6 +90,7 @@ CONFIG_PCMCIA=m ...@@ -86,6 +90,7 @@ CONFIG_PCMCIA=m
CONFIG_PCMCIA_DEBUG=y CONFIG_PCMCIA_DEBUG=y
CONFIG_YENTA=m CONFIG_YENTA=m
CONFIG_CARDBUS=y CONFIG_CARDBUS=y
# CONFIG_PD6729 is not set
# CONFIG_I82092 is not set # CONFIG_I82092 is not set
# CONFIG_TCIC is not set # CONFIG_TCIC is not set
...@@ -107,6 +112,8 @@ CONFIG_BINFMT_ELF=y ...@@ -107,6 +112,8 @@ CONFIG_BINFMT_ELF=y
# #
# Generic Driver Options # Generic Driver Options
# #
# CONFIG_STANDALONE is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_DEBUG_DRIVER=y CONFIG_DEBUG_DRIVER=y
...@@ -135,7 +142,7 @@ CONFIG_BLK_DEV_UMEM=m ...@@ -135,7 +142,7 @@ CONFIG_BLK_DEV_UMEM=m
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_CARMEL is not set # CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=6144 CONFIG_BLK_DEV_RAM_SIZE=6144
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
...@@ -165,7 +172,6 @@ CONFIG_CHR_DEV_SG=y ...@@ -165,7 +172,6 @@ CONFIG_CHR_DEV_SG=y
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
# #
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_REPORT_LUNS=y
# CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_LOGGING is not set
...@@ -179,6 +185,7 @@ CONFIG_SCSI_FC_ATTRS=m ...@@ -179,6 +185,7 @@ CONFIG_SCSI_FC_ATTRS=m
# SCSI low-level drivers # SCSI low-level drivers
# #
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX is not set
...@@ -353,6 +360,8 @@ CONFIG_IP_NF_ARP_MANGLE=m ...@@ -353,6 +360,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
# CONFIG_IP_NF_COMPAT_IPFWADM is not set # CONFIG_IP_NF_COMPAT_IPFWADM is not set
CONFIG_IP_NF_TARGET_NOTRACK=m CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_RAW=m CONFIG_IP_NF_RAW=m
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
# CONFIG_IP_NF_MATCH_REALM is not set
CONFIG_XFRM=y CONFIG_XFRM=y
CONFIG_XFRM_USER=m CONFIG_XFRM_USER=m
...@@ -379,6 +388,7 @@ CONFIG_LLC2=m ...@@ -379,6 +388,7 @@ CONFIG_LLC2=m
# QoS and/or fair queueing # QoS and/or fair queueing
# #
# CONFIG_NET_SCHED is not set # CONFIG_NET_SCHED is not set
# CONFIG_NET_CLS_ROUTE is not set
# #
# Network testing # Network testing
...@@ -452,6 +462,7 @@ CONFIG_EPIC100=m ...@@ -452,6 +462,7 @@ CONFIG_EPIC100=m
# CONFIG_SUNDANCE is not set # CONFIG_SUNDANCE is not set
CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_MMIO=y
# CONFIG_VIA_VELOCITY is not set
# #
# Ethernet (1000 Mbit) # Ethernet (1000 Mbit)
...@@ -501,7 +512,6 @@ CONFIG_PCMCIA_NETWAVE=m ...@@ -501,7 +512,6 @@ CONFIG_PCMCIA_NETWAVE=m
# #
# Wireless 802.11b ISA/PCI cards support # Wireless 802.11b ISA/PCI cards support
# #
# CONFIG_AIRO is not set
CONFIG_HERMES=m CONFIG_HERMES=m
CONFIG_PLX_HERMES=m CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m CONFIG_TMD_HERMES=m
...@@ -644,7 +654,6 @@ CONFIG_GEN_RTC_X=y ...@@ -644,7 +654,6 @@ CONFIG_GEN_RTC_X=y
# #
# Ftape, the floppy tape device driver # Ftape, the floppy tape device driver
# #
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set # CONFIG_AGP is not set
# CONFIG_DRM is not set # CONFIG_DRM is not set
...@@ -660,6 +669,11 @@ CONFIG_MAX_RAW_DEVS=256 ...@@ -660,6 +669,11 @@ CONFIG_MAX_RAW_DEVS=256
# #
# CONFIG_I2C is not set # CONFIG_I2C is not set
#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
# #
# Misc devices # Misc devices
# #
...@@ -734,6 +748,7 @@ CONFIG_ISO9660_FS=y ...@@ -734,6 +748,7 @@ CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set # CONFIG_ZISOFS is not set
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y
# #
# DOS/FAT/NT Filesystems # DOS/FAT/NT Filesystems
...@@ -741,6 +756,8 @@ CONFIG_UDF_FS=m ...@@ -741,6 +756,8 @@ CONFIG_UDF_FS=m
CONFIG_FAT_FS=m CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set # CONFIG_NTFS_FS is not set
# #
...@@ -795,6 +812,9 @@ CONFIG_SMB_FS=m ...@@ -795,6 +812,9 @@ CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp437" CONFIG_SMB_NLS_REMOTE="cp437"
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_XATTR is not set
# CONFIG_CIFS_POSIX is not set
# CONFIG_NCP_FS is not set # CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set # CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set # CONFIG_AFS_FS is not set
...@@ -833,6 +853,7 @@ CONFIG_NLS_CODEPAGE_865=m ...@@ -833,6 +853,7 @@ CONFIG_NLS_CODEPAGE_865=m
# CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_3=m
...@@ -860,6 +881,8 @@ CONFIG_OPROFILE=m ...@@ -860,6 +881,8 @@ CONFIG_OPROFILE=m
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SLAB is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_RWLOCK is not set
# CONFIG_FRAME_POINTER is not set # CONFIG_FRAME_POINTER is not set
# CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_INFO is not set
...@@ -886,7 +909,9 @@ CONFIG_CRYPTO_SERPENT=m ...@@ -886,7 +909,9 @@ CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CAST6=m
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_ARC4 is not set
# CONFIG_CRYPTO_KHAZAD is not set
CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DEFLATE=m
# CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C=m
...@@ -895,6 +920,7 @@ CONFIG_CRYPTO_TEST=m ...@@ -895,6 +920,7 @@ CONFIG_CRYPTO_TEST=m
# #
# Library routines # Library routines
# #
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y CONFIG_CRC32=y
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_INFLATE=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment