aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-11-20 19:45:52 -0500
committerPaul Mackerras <paulus@samba.org>2007-12-06 00:09:00 -0500
commitd4a76d2bdf7e1cd9006765437165fb875f17fc34 (patch)
treed9550d58a6dbc18095c6242b24d2a0f19a209d84
parent81a3843f97cff5fef7b6006fcd2d015d3c4b569f (diff)
[POWERPC] Update iseries_defconfig
The notable changes here are the enabling of NO_HZ and HIGH_RES_TIMERS. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/configs/iseries_defconfig123
1 files changed, 64 insertions, 59 deletions
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index d78e3a6fc68c..4a87745c7803 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc4 3# Linux kernel version: 2.6.24-rc3
4# Thu Aug 30 16:37:16 2007 4# Wed Nov 21 11:19:59 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14# CONFIG_TUNE_CELL is not set
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15# CONFIG_ALTIVEC is not set 16# CONFIG_ALTIVEC is not set
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=32 21CONFIG_NR_CPUS=32
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,12 +69,17 @@ CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66CONFIG_AUDIT=y 73CONFIG_AUDIT=y
67CONFIG_AUDITSYSCALL=y 74CONFIG_AUDITSYSCALL=y
75CONFIG_AUDIT_TREE=y
68CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=17 78CONFIG_LOG_BUF_SHIFT=17
71# CONFIG_CPUSETS is not set 79# CONFIG_CGROUPS is not set
80CONFIG_FAIR_GROUP_SCHED=y
81CONFIG_FAIR_USER_SCHED=y
82# CONFIG_FAIR_CGROUP_SCHED is not set
72CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
74CONFIG_BLK_DEV_INITRD=y 85CONFIG_BLK_DEV_INITRD=y
@@ -89,7 +100,6 @@ CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 101CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 104CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -110,6 +120,7 @@ CONFIG_STOP_MACHINE=y
110CONFIG_BLOCK=y 120CONFIG_BLOCK=y
111# CONFIG_BLK_DEV_IO_TRACE is not set 121# CONFIG_BLK_DEV_IO_TRACE is not set
112CONFIG_BLK_DEV_BSG=y 122CONFIG_BLK_DEV_BSG=y
123CONFIG_BLOCK_COMPAT=y
113 124
114# 125#
115# IO Schedulers 126# IO Schedulers
@@ -128,7 +139,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
128# Platform support 139# Platform support
129# 140#
130CONFIG_PPC_MULTIPLATFORM=y 141CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_EMBEDDED6xx is not set
132# CONFIG_PPC_82xx is not set 142# CONFIG_PPC_82xx is not set
133# CONFIG_PPC_83xx is not set 143# CONFIG_PPC_83xx is not set
134# CONFIG_PPC_86xx is not set 144# CONFIG_PPC_86xx is not set
@@ -172,6 +182,10 @@ CONFIG_GENERIC_IOMAP=y
172# 182#
173# Kernel options 183# Kernel options
174# 184#
185CONFIG_TICK_ONESHOT=y
186CONFIG_NO_HZ=y
187CONFIG_HIGH_RES_TIMERS=y
188CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
175# CONFIG_HZ_100 is not set 189# CONFIG_HZ_100 is not set
176CONFIG_HZ_250=y 190CONFIG_HZ_250=y
177# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
@@ -201,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
201CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
202CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
203# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
204CONFIG_SPLIT_PTLOCK_CPUS=4 219CONFIG_SPLIT_PTLOCK_CPUS=4
205CONFIG_RESOURCES_64BIT=y 220CONFIG_RESOURCES_64BIT=y
206CONFIG_ZONE_DMA_FLAG=1 221CONFIG_ZONE_DMA_FLAG=1
@@ -227,11 +242,8 @@ CONFIG_PCI_SYSCALL=y
227# CONFIG_PCIEPORTBUS is not set 242# CONFIG_PCIEPORTBUS is not set
228CONFIG_ARCH_SUPPORTS_MSI=y 243CONFIG_ARCH_SUPPORTS_MSI=y
229# CONFIG_PCI_MSI is not set 244# CONFIG_PCI_MSI is not set
245CONFIG_PCI_LEGACY=y
230# CONFIG_PCI_DEBUG is not set 246# CONFIG_PCI_DEBUG is not set
231
232#
233# PCCARD (PCMCIA/CardBus) support
234#
235# CONFIG_PCCARD is not set 247# CONFIG_PCCARD is not set
236# CONFIG_HOTPLUG_PCI is not set 248# CONFIG_HOTPLUG_PCI is not set
237CONFIG_KERNEL_START=0xc000000000000000 249CONFIG_KERNEL_START=0xc000000000000000
@@ -271,6 +283,7 @@ CONFIG_INET_TUNNEL=y
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 283CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y 284CONFIG_INET_XFRM_MODE_TUNNEL=y
273CONFIG_INET_XFRM_MODE_BEET=m 285CONFIG_INET_XFRM_MODE_BEET=m
286# CONFIG_INET_LRO is not set
274CONFIG_INET_DIAG=y 287CONFIG_INET_DIAG=y
275CONFIG_INET_TCP_DIAG=y 288CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set 289# CONFIG_TCP_CONG_ADVANCED is not set
@@ -338,6 +351,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
338# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 351# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
339CONFIG_NETFILTER_XT_MATCH_STRING=m 352CONFIG_NETFILTER_XT_MATCH_STRING=m
340CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 353CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
354CONFIG_NETFILTER_XT_MATCH_TIME=m
341# CONFIG_NETFILTER_XT_MATCH_U32 is not set 355# CONFIG_NETFILTER_XT_MATCH_U32 is not set
342# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 356# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
343 357
@@ -403,10 +417,6 @@ CONFIG_LLC=y
403# CONFIG_LAPB is not set 417# CONFIG_LAPB is not set
404# CONFIG_ECONET is not set 418# CONFIG_ECONET is not set
405# CONFIG_WAN_ROUTER is not set 419# CONFIG_WAN_ROUTER is not set
406
407#
408# QoS and/or fair queueing
409#
410# CONFIG_NET_SCHED is not set 420# CONFIG_NET_SCHED is not set
411CONFIG_NET_CLS_ROUTE=y 421CONFIG_NET_CLS_ROUTE=y
412 422
@@ -436,6 +446,7 @@ CONFIG_NET_CLS_ROUTE=y
436# 446#
437# Generic Driver Options 447# Generic Driver Options
438# 448#
449CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
439CONFIG_STANDALONE=y 450CONFIG_STANDALONE=y
440CONFIG_PREVENT_FIRMWARE_BUILD=y 451CONFIG_PREVENT_FIRMWARE_BUILD=y
441CONFIG_FW_LOADER=m 452CONFIG_FW_LOADER=m
@@ -508,6 +519,7 @@ CONFIG_SCSI_FC_ATTRS=y
508CONFIG_SCSI_SAS_ATTRS=m 519CONFIG_SCSI_SAS_ATTRS=m
509CONFIG_SCSI_SAS_LIBSAS=m 520CONFIG_SCSI_SAS_LIBSAS=m
510CONFIG_SCSI_SAS_LIBSAS_DEBUG=y 521CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
522CONFIG_SCSI_SRP_ATTRS=m
511CONFIG_SCSI_LOWLEVEL=y 523CONFIG_SCSI_LOWLEVEL=y
512# CONFIG_ISCSI_TCP is not set 524# CONFIG_ISCSI_TCP is not set
513# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 525# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -559,14 +571,8 @@ CONFIG_DM_MIRROR=m
559CONFIG_DM_ZERO=m 571CONFIG_DM_ZERO=m
560# CONFIG_DM_MULTIPATH is not set 572# CONFIG_DM_MULTIPATH is not set
561# CONFIG_DM_DELAY is not set 573# CONFIG_DM_DELAY is not set
562 574# CONFIG_DM_UEVENT is not set
563#
564# Fusion MPT device support
565#
566# CONFIG_FUSION is not set 575# CONFIG_FUSION is not set
567# CONFIG_FUSION_SPI is not set
568# CONFIG_FUSION_FC is not set
569# CONFIG_FUSION_SAS is not set
570 576
571# 577#
572# IEEE 1394 (FireWire) support 578# IEEE 1394 (FireWire) support
@@ -582,6 +588,8 @@ CONFIG_BONDING=m
582# CONFIG_MACVLAN is not set 588# CONFIG_MACVLAN is not set
583# CONFIG_EQUALIZER is not set 589# CONFIG_EQUALIZER is not set
584CONFIG_TUN=m 590CONFIG_TUN=m
591# CONFIG_VETH is not set
592# CONFIG_IP1000 is not set
585# CONFIG_ARCNET is not set 593# CONFIG_ARCNET is not set
586# CONFIG_PHYLIB is not set 594# CONFIG_PHYLIB is not set
587CONFIG_NET_ETHERNET=y 595CONFIG_NET_ETHERNET=y
@@ -592,6 +600,10 @@ CONFIG_MII=y
592# CONFIG_NET_VENDOR_3COM is not set 600# CONFIG_NET_VENDOR_3COM is not set
593# CONFIG_NET_TULIP is not set 601# CONFIG_NET_TULIP is not set
594# CONFIG_HP100 is not set 602# CONFIG_HP100 is not set
603# CONFIG_IBM_NEW_EMAC_ZMII is not set
604# CONFIG_IBM_NEW_EMAC_RGMII is not set
605# CONFIG_IBM_NEW_EMAC_TAH is not set
606# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
595CONFIG_NET_PCI=y 607CONFIG_NET_PCI=y
596CONFIG_PCNET32=y 608CONFIG_PCNET32=y
597CONFIG_PCNET32_NAPI=y 609CONFIG_PCNET32_NAPI=y
@@ -599,7 +611,6 @@ CONFIG_PCNET32_NAPI=y
599# CONFIG_ADAPTEC_STARFIRE is not set 611# CONFIG_ADAPTEC_STARFIRE is not set
600# CONFIG_B44 is not set 612# CONFIG_B44 is not set
601# CONFIG_FORCEDETH is not set 613# CONFIG_FORCEDETH is not set
602# CONFIG_DGRS is not set
603# CONFIG_EEPRO100 is not set 614# CONFIG_EEPRO100 is not set
604CONFIG_E100=y 615CONFIG_E100=y
605# CONFIG_FEALNX is not set 616# CONFIG_FEALNX is not set
@@ -619,6 +630,7 @@ CONFIG_ACENIC=m
619CONFIG_E1000=m 630CONFIG_E1000=m
620# CONFIG_E1000_NAPI is not set 631# CONFIG_E1000_NAPI is not set
621# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 632# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
633# CONFIG_E1000E is not set
622# CONFIG_NS83820 is not set 634# CONFIG_NS83820 is not set
623# CONFIG_HAMACHI is not set 635# CONFIG_HAMACHI is not set
624# CONFIG_YELLOWFIN is not set 636# CONFIG_YELLOWFIN is not set
@@ -626,6 +638,7 @@ CONFIG_E1000=m
626# CONFIG_SIS190 is not set 638# CONFIG_SIS190 is not set
627# CONFIG_SKGE is not set 639# CONFIG_SKGE is not set
628# CONFIG_SKY2 is not set 640# CONFIG_SKY2 is not set
641# CONFIG_SK98LIN is not set
629# CONFIG_VIA_VELOCITY is not set 642# CONFIG_VIA_VELOCITY is not set
630# CONFIG_TIGON3 is not set 643# CONFIG_TIGON3 is not set
631# CONFIG_BNX2 is not set 644# CONFIG_BNX2 is not set
@@ -634,12 +647,15 @@ CONFIG_E1000=m
634CONFIG_NETDEV_10000=y 647CONFIG_NETDEV_10000=y
635# CONFIG_CHELSIO_T1 is not set 648# CONFIG_CHELSIO_T1 is not set
636# CONFIG_CHELSIO_T3 is not set 649# CONFIG_CHELSIO_T3 is not set
650# CONFIG_IXGBE is not set
637# CONFIG_IXGB is not set 651# CONFIG_IXGB is not set
638# CONFIG_S2IO is not set 652# CONFIG_S2IO is not set
639# CONFIG_MYRI10GE is not set 653# CONFIG_MYRI10GE is not set
640# CONFIG_NETXEN_NIC is not set 654# CONFIG_NETXEN_NIC is not set
655# CONFIG_NIU is not set
641# CONFIG_PASEMI_MAC is not set 656# CONFIG_PASEMI_MAC is not set
642# CONFIG_MLX4_CORE is not set 657# CONFIG_MLX4_CORE is not set
658# CONFIG_TEHUTI is not set
643CONFIG_TR=y 659CONFIG_TR=y
644CONFIG_IBMOL=y 660CONFIG_IBMOL=y
645# CONFIG_3C359 is not set 661# CONFIG_3C359 is not set
@@ -669,6 +685,7 @@ CONFIG_SLHC=m
669# CONFIG_NET_FC is not set 685# CONFIG_NET_FC is not set
670# CONFIG_SHAPER is not set 686# CONFIG_SHAPER is not set
671CONFIG_NETCONSOLE=y 687CONFIG_NETCONSOLE=y
688# CONFIG_NETCONSOLE_DYNAMIC is not set
672CONFIG_NETPOLL=y 689CONFIG_NETPOLL=y
673CONFIG_NETPOLL_TRAP=y 690CONFIG_NETPOLL_TRAP=y
674CONFIG_NET_POLL_CONTROLLER=y 691CONFIG_NET_POLL_CONTROLLER=y
@@ -690,7 +707,6 @@ CONFIG_INPUT_MOUSEDEV=y
690CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 707CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
691CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 708CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
692# CONFIG_INPUT_JOYDEV is not set 709# CONFIG_INPUT_JOYDEV is not set
693# CONFIG_INPUT_TSDEV is not set
694# CONFIG_INPUT_EVDEV is not set 710# CONFIG_INPUT_EVDEV is not set
695# CONFIG_INPUT_EVBUG is not set 711# CONFIG_INPUT_EVBUG is not set
696 712
@@ -736,14 +752,11 @@ CONFIG_LEGACY_PTY_COUNT=256
736CONFIG_HVC_DRIVER=y 752CONFIG_HVC_DRIVER=y
737CONFIG_HVC_ISERIES=y 753CONFIG_HVC_ISERIES=y
738# CONFIG_IPMI_HANDLER is not set 754# CONFIG_IPMI_HANDLER is not set
739# CONFIG_WATCHDOG is not set
740# CONFIG_HW_RANDOM is not set 755# CONFIG_HW_RANDOM is not set
741CONFIG_GEN_RTC=y 756CONFIG_GEN_RTC=y
742# CONFIG_GEN_RTC_X is not set 757# CONFIG_GEN_RTC_X is not set
743# CONFIG_R3964 is not set 758# CONFIG_R3964 is not set
744# CONFIG_APPLICOM is not set 759# CONFIG_APPLICOM is not set
745# CONFIG_AGP is not set
746# CONFIG_DRM is not set
747CONFIG_RAW_DRIVER=y 760CONFIG_RAW_DRIVER=y
748CONFIG_MAX_RAW_DEVS=256 761CONFIG_MAX_RAW_DEVS=256
749# CONFIG_HANGCHECK_TIMER is not set 762# CONFIG_HANGCHECK_TIMER is not set
@@ -759,6 +772,13 @@ CONFIG_DEVPORT=y
759# CONFIG_W1 is not set 772# CONFIG_W1 is not set
760# CONFIG_POWER_SUPPLY is not set 773# CONFIG_POWER_SUPPLY is not set
761# CONFIG_HWMON is not set 774# CONFIG_HWMON is not set
775# CONFIG_WATCHDOG is not set
776
777#
778# Sonics Silicon Backplane
779#
780CONFIG_SSB_POSSIBLE=y
781# CONFIG_SSB is not set
762 782
763# 783#
764# Multifunction device drivers 784# Multifunction device drivers
@@ -775,16 +795,17 @@ CONFIG_DEVPORT=y
775# 795#
776# Graphics support 796# Graphics support
777# 797#
798# CONFIG_AGP is not set
799# CONFIG_DRM is not set
800# CONFIG_VGASTATE is not set
801# CONFIG_VIDEO_OUTPUT_CONTROL is not set
802# CONFIG_FB is not set
778# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 803# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
779 804
780# 805#
781# Display device support 806# Display device support
782# 807#
783# CONFIG_DISPLAY_SUPPORT is not set 808# CONFIG_DISPLAY_SUPPORT is not set
784# CONFIG_VGASTATE is not set
785# CONFIG_VIDEO_OUTPUT_CONTROL is not set
786# CONFIG_FB is not set
787# CONFIG_FB_IBM_GXT4500 is not set
788 809
789# 810#
790# Console display driver support 811# Console display driver support
@@ -806,19 +827,6 @@ CONFIG_DUMMY_CONSOLE=y
806# CONFIG_RTC_CLASS is not set 827# CONFIG_RTC_CLASS is not set
807 828
808# 829#
809# DMA Engine support
810#
811# CONFIG_DMA_ENGINE is not set
812
813#
814# DMA Clients
815#
816
817#
818# DMA Devices
819#
820
821#
822# Userspace I/O 830# Userspace I/O
823# 831#
824# CONFIG_UIO is not set 832# CONFIG_UIO is not set
@@ -902,7 +910,6 @@ CONFIG_TMPFS=y
902CONFIG_TMPFS_POSIX_ACL=y 910CONFIG_TMPFS_POSIX_ACL=y
903# CONFIG_HUGETLBFS is not set 911# CONFIG_HUGETLBFS is not set
904# CONFIG_HUGETLB_PAGE is not set 912# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y
906CONFIG_CONFIGFS_FS=m 913CONFIG_CONFIGFS_FS=m
907 914
908# 915#
@@ -921,10 +928,7 @@ CONFIG_CRAMFS=y
921# CONFIG_QNX4FS_FS is not set 928# CONFIG_QNX4FS_FS is not set
922# CONFIG_SYSV_FS is not set 929# CONFIG_SYSV_FS is not set
923# CONFIG_UFS_FS is not set 930# CONFIG_UFS_FS is not set
924 931CONFIG_NETWORK_FILESYSTEMS=y
925#
926# Network File Systems
927#
928CONFIG_NFS_FS=y 932CONFIG_NFS_FS=y
929CONFIG_NFS_V3=y 933CONFIG_NFS_V3=y
930CONFIG_NFS_V3_ACL=y 934CONFIG_NFS_V3_ACL=y
@@ -963,10 +967,6 @@ CONFIG_CIFS_POSIX=y
963# 967#
964# CONFIG_PARTITION_ADVANCED is not set 968# CONFIG_PARTITION_ADVANCED is not set
965CONFIG_MSDOS_PARTITION=y 969CONFIG_MSDOS_PARTITION=y
966
967#
968# Native Language Support
969#
970CONFIG_NLS=y 970CONFIG_NLS=y
971CONFIG_NLS_DEFAULT="iso8859-1" 971CONFIG_NLS_DEFAULT="iso8859-1"
972CONFIG_NLS_CODEPAGE_437=y 972CONFIG_NLS_CODEPAGE_437=y
@@ -1007,10 +1007,6 @@ CONFIG_NLS_ISO8859_1=y
1007# CONFIG_NLS_KOI8_R is not set 1007# CONFIG_NLS_KOI8_R is not set
1008# CONFIG_NLS_KOI8_U is not set 1008# CONFIG_NLS_KOI8_U is not set
1009# CONFIG_NLS_UTF8 is not set 1009# CONFIG_NLS_UTF8 is not set
1010
1011#
1012# Distributed Lock Manager
1013#
1014CONFIG_DLM=m 1010CONFIG_DLM=m
1015# CONFIG_DLM_DEBUG is not set 1011# CONFIG_DLM_DEBUG is not set
1016# CONFIG_UCC_SLOW is not set 1012# CONFIG_UCC_SLOW is not set
@@ -1035,17 +1031,16 @@ CONFIG_PLIST=y
1035CONFIG_HAS_IOMEM=y 1031CONFIG_HAS_IOMEM=y
1036CONFIG_HAS_IOPORT=y 1032CONFIG_HAS_IOPORT=y
1037CONFIG_HAS_DMA=y 1033CONFIG_HAS_DMA=y
1038 1034CONFIG_INSTRUMENTATION=y
1039#
1040# Instrumentation Support
1041#
1042# CONFIG_PROFILING is not set 1035# CONFIG_PROFILING is not set
1043# CONFIG_KPROBES is not set 1036# CONFIG_KPROBES is not set
1037# CONFIG_MARKERS is not set
1044 1038
1045# 1039#
1046# Kernel hacking 1040# Kernel hacking
1047# 1041#
1048# CONFIG_PRINTK_TIME is not set 1042# CONFIG_PRINTK_TIME is not set
1043CONFIG_ENABLE_WARN_DEPRECATED=y
1049CONFIG_ENABLE_MUST_CHECK=y 1044CONFIG_ENABLE_MUST_CHECK=y
1050CONFIG_MAGIC_SYSRQ=y 1045CONFIG_MAGIC_SYSRQ=y
1051# CONFIG_UNUSED_SYMBOLS is not set 1046# CONFIG_UNUSED_SYMBOLS is not set
@@ -1069,14 +1064,18 @@ CONFIG_DEBUG_BUGVERBOSE=y
1069# CONFIG_DEBUG_INFO is not set 1064# CONFIG_DEBUG_INFO is not set
1070# CONFIG_DEBUG_VM is not set 1065# CONFIG_DEBUG_VM is not set
1071# CONFIG_DEBUG_LIST is not set 1066# CONFIG_DEBUG_LIST is not set
1067# CONFIG_DEBUG_SG is not set
1072# CONFIG_FORCED_INLINING is not set 1068# CONFIG_FORCED_INLINING is not set
1069# CONFIG_BOOT_PRINTK_DELAY is not set
1073# CONFIG_RCU_TORTURE_TEST is not set 1070# CONFIG_RCU_TORTURE_TEST is not set
1074# CONFIG_FAULT_INJECTION is not set 1071# CONFIG_FAULT_INJECTION is not set
1072# CONFIG_SAMPLES is not set
1075CONFIG_DEBUG_STACKOVERFLOW=y 1073CONFIG_DEBUG_STACKOVERFLOW=y
1076CONFIG_DEBUG_STACK_USAGE=y 1074CONFIG_DEBUG_STACK_USAGE=y
1077# CONFIG_DEBUG_PAGEALLOC is not set 1075# CONFIG_DEBUG_PAGEALLOC is not set
1078# CONFIG_DEBUGGER is not set 1076# CONFIG_DEBUGGER is not set
1079CONFIG_IRQSTACKS=y 1077CONFIG_IRQSTACKS=y
1078# CONFIG_VIRQ_DEBUG is not set
1080# CONFIG_BOOTX_TEXT is not set 1079# CONFIG_BOOTX_TEXT is not set
1081# CONFIG_PPC_EARLY_DEBUG is not set 1080# CONFIG_PPC_EARLY_DEBUG is not set
1082 1081
@@ -1085,8 +1084,10 @@ CONFIG_IRQSTACKS=y
1085# 1084#
1086# CONFIG_KEYS is not set 1085# CONFIG_KEYS is not set
1087# CONFIG_SECURITY is not set 1086# CONFIG_SECURITY is not set
1087# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1088CONFIG_CRYPTO=y 1088CONFIG_CRYPTO=y
1089CONFIG_CRYPTO_ALGAPI=y 1089CONFIG_CRYPTO_ALGAPI=y
1090CONFIG_CRYPTO_AEAD=m
1090CONFIG_CRYPTO_BLKCIPHER=y 1091CONFIG_CRYPTO_BLKCIPHER=y
1091CONFIG_CRYPTO_HASH=y 1092CONFIG_CRYPTO_HASH=y
1092CONFIG_CRYPTO_MANAGER=y 1093CONFIG_CRYPTO_MANAGER=y
@@ -1105,6 +1106,7 @@ CONFIG_CRYPTO_ECB=m
1105CONFIG_CRYPTO_CBC=y 1106CONFIG_CRYPTO_CBC=y
1106CONFIG_CRYPTO_PCBC=m 1107CONFIG_CRYPTO_PCBC=m
1107# CONFIG_CRYPTO_LRW is not set 1108# CONFIG_CRYPTO_LRW is not set
1109# CONFIG_CRYPTO_XTS is not set
1108# CONFIG_CRYPTO_CRYPTD is not set 1110# CONFIG_CRYPTO_CRYPTD is not set
1109CONFIG_CRYPTO_DES=y 1111CONFIG_CRYPTO_DES=y
1110# CONFIG_CRYPTO_FCRYPT is not set 1112# CONFIG_CRYPTO_FCRYPT is not set
@@ -1119,9 +1121,12 @@ CONFIG_CRYPTO_TEA=m
1119CONFIG_CRYPTO_ARC4=m 1121CONFIG_CRYPTO_ARC4=m
1120CONFIG_CRYPTO_KHAZAD=m 1122CONFIG_CRYPTO_KHAZAD=m
1121CONFIG_CRYPTO_ANUBIS=m 1123CONFIG_CRYPTO_ANUBIS=m
1124CONFIG_CRYPTO_SEED=m
1122CONFIG_CRYPTO_DEFLATE=m 1125CONFIG_CRYPTO_DEFLATE=m
1123CONFIG_CRYPTO_MICHAEL_MIC=m 1126CONFIG_CRYPTO_MICHAEL_MIC=m
1124CONFIG_CRYPTO_CRC32C=m 1127CONFIG_CRYPTO_CRC32C=m
1125# CONFIG_CRYPTO_CAMELLIA is not set 1128# CONFIG_CRYPTO_CAMELLIA is not set
1126CONFIG_CRYPTO_TEST=m 1129CONFIG_CRYPTO_TEST=m
1130CONFIG_CRYPTO_AUTHENC=m
1127# CONFIG_CRYPTO_HW is not set 1131# CONFIG_CRYPTO_HW is not set
1132# CONFIG_PPC_CLOCK is not set