diff options
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 75 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 63 |
2 files changed, 79 insertions, 59 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 7b3804a6e363..b5b259960794 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -137,8 +137,9 @@ CONFIG_TRACEPOINTS=y | |||
| 137 | CONFIG_MARKERS=y | 137 | CONFIG_MARKERS=y |
| 138 | CONFIG_OPROFILE=y | 138 | CONFIG_OPROFILE=y |
| 139 | CONFIG_HAVE_OPROFILE=y | 139 | CONFIG_HAVE_OPROFILE=y |
| 140 | # CONFIG_KPROBES is not set | 140 | CONFIG_KPROBES=y |
| 141 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 141 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
| 142 | CONFIG_KRETPROBES=y | ||
| 142 | CONFIG_HAVE_IOREMAP_PROT=y | 143 | CONFIG_HAVE_IOREMAP_PROT=y |
| 143 | CONFIG_HAVE_KPROBES=y | 144 | CONFIG_HAVE_KPROBES=y |
| 144 | CONFIG_HAVE_KRETPROBES=y | 145 | CONFIG_HAVE_KRETPROBES=y |
| @@ -191,6 +192,7 @@ CONFIG_SCANLOG=m | |||
| 191 | CONFIG_LPARCFG=y | 192 | CONFIG_LPARCFG=y |
| 192 | CONFIG_PPC_SMLPAR=y | 193 | CONFIG_PPC_SMLPAR=y |
| 193 | CONFIG_CMM=y | 194 | CONFIG_CMM=y |
| 195 | CONFIG_DTL=y | ||
| 194 | CONFIG_PPC_ISERIES=y | 196 | CONFIG_PPC_ISERIES=y |
| 195 | 197 | ||
| 196 | # | 198 | # |
| @@ -328,9 +330,10 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | |||
| 328 | CONFIG_KEXEC=y | 330 | CONFIG_KEXEC=y |
| 329 | # CONFIG_PHYP_DUMP is not set | 331 | # CONFIG_PHYP_DUMP is not set |
| 330 | CONFIG_IRQ_ALL_CPUS=y | 332 | CONFIG_IRQ_ALL_CPUS=y |
| 331 | # CONFIG_NUMA is not set | 333 | CONFIG_NUMA=y |
| 334 | CONFIG_NODES_SHIFT=8 | ||
| 335 | CONFIG_MAX_ACTIVE_REGIONS=256 | ||
| 332 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 336 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 333 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 334 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 337 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 335 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 338 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 336 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 339 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| @@ -339,6 +342,7 @@ CONFIG_SELECT_MEMORY_MODEL=y | |||
| 339 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 342 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 340 | CONFIG_SPARSEMEM_MANUAL=y | 343 | CONFIG_SPARSEMEM_MANUAL=y |
| 341 | CONFIG_SPARSEMEM=y | 344 | CONFIG_SPARSEMEM=y |
| 345 | CONFIG_NEED_MULTIPLE_NODES=y | ||
| 342 | CONFIG_HAVE_MEMORY_PRESENT=y | 346 | CONFIG_HAVE_MEMORY_PRESENT=y |
| 343 | CONFIG_SPARSEMEM_EXTREME=y | 347 | CONFIG_SPARSEMEM_EXTREME=y |
| 344 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 348 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| @@ -354,11 +358,12 @@ CONFIG_PHYS_ADDR_T_64BIT=y | |||
| 354 | CONFIG_ZONE_DMA_FLAG=1 | 358 | CONFIG_ZONE_DMA_FLAG=1 |
| 355 | CONFIG_BOUNCE=y | 359 | CONFIG_BOUNCE=y |
| 356 | CONFIG_UNEVICTABLE_LRU=y | 360 | CONFIG_UNEVICTABLE_LRU=y |
| 361 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
| 357 | CONFIG_ARCH_MEMORY_PROBE=y | 362 | CONFIG_ARCH_MEMORY_PROBE=y |
| 358 | CONFIG_PPC_HAS_HASH_64K=y | 363 | CONFIG_PPC_HAS_HASH_64K=y |
| 359 | # CONFIG_PPC_64K_PAGES is not set | 364 | # CONFIG_PPC_64K_PAGES is not set |
| 360 | CONFIG_FORCE_MAX_ZONEORDER=13 | 365 | CONFIG_FORCE_MAX_ZONEORDER=13 |
| 361 | # CONFIG_SCHED_SMT is not set | 366 | CONFIG_SCHED_SMT=y |
| 362 | CONFIG_PROC_DEVICETREE=y | 367 | CONFIG_PROC_DEVICETREE=y |
| 363 | # CONFIG_CMDLINE_BOOL is not set | 368 | # CONFIG_CMDLINE_BOOL is not set |
| 364 | CONFIG_EXTRA_TARGETS="" | 369 | CONFIG_EXTRA_TARGETS="" |
| @@ -790,12 +795,12 @@ CONFIG_SCSI_IPR=y | |||
| 790 | CONFIG_SCSI_IPR_TRACE=y | 795 | CONFIG_SCSI_IPR_TRACE=y |
| 791 | CONFIG_SCSI_IPR_DUMP=y | 796 | CONFIG_SCSI_IPR_DUMP=y |
| 792 | # CONFIG_SCSI_QLOGIC_1280 is not set | 797 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 793 | # CONFIG_SCSI_QLA_FC is not set | 798 | CONFIG_SCSI_QLA_FC=m |
| 794 | # CONFIG_SCSI_QLA_ISCSI is not set | 799 | # CONFIG_SCSI_QLA_ISCSI is not set |
| 795 | CONFIG_SCSI_LPFC=m | 800 | CONFIG_SCSI_LPFC=m |
| 796 | # CONFIG_SCSI_DC395x is not set | 801 | # CONFIG_SCSI_DC395x is not set |
| 797 | # CONFIG_SCSI_DC390T is not set | 802 | # CONFIG_SCSI_DC390T is not set |
| 798 | CONFIG_SCSI_DEBUG=m | 803 | # CONFIG_SCSI_DEBUG is not set |
| 799 | # CONFIG_SCSI_SRP is not set | 804 | # CONFIG_SCSI_SRP is not set |
| 800 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 805 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 801 | # CONFIG_SCSI_DH is not set | 806 | # CONFIG_SCSI_DH is not set |
| @@ -867,9 +872,8 @@ CONFIG_MD_AUTODETECT=y | |||
| 867 | CONFIG_MD_LINEAR=y | 872 | CONFIG_MD_LINEAR=y |
| 868 | CONFIG_MD_RAID0=y | 873 | CONFIG_MD_RAID0=y |
| 869 | CONFIG_MD_RAID1=y | 874 | CONFIG_MD_RAID1=y |
| 870 | CONFIG_MD_RAID10=y | 875 | CONFIG_MD_RAID10=m |
| 871 | CONFIG_MD_RAID456=y | 876 | CONFIG_MD_RAID456=m |
| 872 | CONFIG_MD_RAID5_RESHAPE=y | ||
| 873 | CONFIG_MD_MULTIPATH=m | 877 | CONFIG_MD_MULTIPATH=m |
| 874 | CONFIG_MD_FAULTY=m | 878 | CONFIG_MD_FAULTY=m |
| 875 | CONFIG_BLK_DEV_DM=y | 879 | CONFIG_BLK_DEV_DM=y |
| @@ -984,7 +988,7 @@ CONFIG_ACENIC=m | |||
| 984 | CONFIG_ACENIC_OMIT_TIGON_I=y | 988 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 985 | # CONFIG_DL2K is not set | 989 | # CONFIG_DL2K is not set |
| 986 | CONFIG_E1000=y | 990 | CONFIG_E1000=y |
| 987 | # CONFIG_E1000E is not set | 991 | CONFIG_E1000E=m |
| 988 | # CONFIG_IP1000 is not set | 992 | # CONFIG_IP1000 is not set |
| 989 | # CONFIG_IGB is not set | 993 | # CONFIG_IGB is not set |
| 990 | # CONFIG_NS83820 is not set | 994 | # CONFIG_NS83820 is not set |
| @@ -1006,19 +1010,19 @@ CONFIG_GELIC_WIRELESS=y | |||
| 1006 | # CONFIG_ATL1E is not set | 1010 | # CONFIG_ATL1E is not set |
| 1007 | # CONFIG_JME is not set | 1011 | # CONFIG_JME is not set |
| 1008 | CONFIG_NETDEV_10000=y | 1012 | CONFIG_NETDEV_10000=y |
| 1009 | # CONFIG_CHELSIO_T1 is not set | 1013 | CONFIG_CHELSIO_T1=m |
| 1010 | # CONFIG_CHELSIO_T3 is not set | 1014 | CONFIG_CHELSIO_T3=m |
| 1011 | CONFIG_EHEA=m | 1015 | CONFIG_EHEA=m |
| 1012 | # CONFIG_ENIC is not set | 1016 | # CONFIG_ENIC is not set |
| 1013 | # CONFIG_IXGBE is not set | 1017 | CONFIG_IXGBE=m |
| 1014 | CONFIG_IXGB=m | 1018 | CONFIG_IXGB=m |
| 1015 | # CONFIG_S2IO is not set | 1019 | CONFIG_S2IO=m |
| 1016 | # CONFIG_MYRI10GE is not set | 1020 | CONFIG_MYRI10GE=m |
| 1017 | # CONFIG_NETXEN_NIC is not set | 1021 | CONFIG_NETXEN_NIC=m |
| 1018 | # CONFIG_NIU is not set | 1022 | # CONFIG_NIU is not set |
| 1019 | CONFIG_PASEMI_MAC=y | 1023 | CONFIG_PASEMI_MAC=y |
| 1020 | # CONFIG_MLX4_EN is not set | 1024 | CONFIG_MLX4_EN=m |
| 1021 | # CONFIG_MLX4_CORE is not set | 1025 | CONFIG_MLX4_CORE=m |
| 1022 | # CONFIG_TEHUTI is not set | 1026 | # CONFIG_TEHUTI is not set |
| 1023 | # CONFIG_BNX2X is not set | 1027 | # CONFIG_BNX2X is not set |
| 1024 | # CONFIG_QLGE is not set | 1028 | # CONFIG_QLGE is not set |
| @@ -1169,7 +1173,7 @@ CONFIG_SERIAL_TXX9=y | |||
| 1169 | CONFIG_HAS_TXX9_SERIAL=y | 1173 | CONFIG_HAS_TXX9_SERIAL=y |
| 1170 | CONFIG_SERIAL_TXX9_NR_UARTS=6 | 1174 | CONFIG_SERIAL_TXX9_NR_UARTS=6 |
| 1171 | CONFIG_SERIAL_TXX9_CONSOLE=y | 1175 | CONFIG_SERIAL_TXX9_CONSOLE=y |
| 1172 | # CONFIG_SERIAL_JSM is not set | 1176 | CONFIG_SERIAL_JSM=m |
| 1173 | # CONFIG_SERIAL_OF_PLATFORM is not set | 1177 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 1174 | CONFIG_UNIX98_PTYS=y | 1178 | CONFIG_UNIX98_PTYS=y |
| 1175 | CONFIG_LEGACY_PTYS=y | 1179 | CONFIG_LEGACY_PTYS=y |
| @@ -1586,7 +1590,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1586 | CONFIG_USB_DEVICE_CLASS=y | 1590 | CONFIG_USB_DEVICE_CLASS=y |
| 1587 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1591 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1588 | # CONFIG_USB_OTG is not set | 1592 | # CONFIG_USB_OTG is not set |
| 1589 | # CONFIG_USB_MON is not set | 1593 | CONFIG_USB_MON=m |
| 1590 | # CONFIG_USB_WUSB is not set | 1594 | # CONFIG_USB_WUSB is not set |
| 1591 | # CONFIG_USB_WUSB_CBAF is not set | 1595 | # CONFIG_USB_WUSB_CBAF is not set |
| 1592 | 1596 | ||
| @@ -1686,21 +1690,22 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1686 | # CONFIG_NEW_LEDS is not set | 1690 | # CONFIG_NEW_LEDS is not set |
| 1687 | # CONFIG_ACCESSIBILITY is not set | 1691 | # CONFIG_ACCESSIBILITY is not set |
| 1688 | CONFIG_INFINIBAND=m | 1692 | CONFIG_INFINIBAND=m |
| 1689 | # CONFIG_INFINIBAND_USER_MAD is not set | 1693 | CONFIG_INFINIBAND_USER_MAD=m |
| 1690 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1694 | CONFIG_INFINIBAND_USER_ACCESS=m |
| 1695 | CONFIG_INFINIBAND_USER_MEM=y | ||
| 1691 | CONFIG_INFINIBAND_ADDR_TRANS=y | 1696 | CONFIG_INFINIBAND_ADDR_TRANS=y |
| 1692 | CONFIG_INFINIBAND_MTHCA=m | 1697 | CONFIG_INFINIBAND_MTHCA=m |
| 1693 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | 1698 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
| 1694 | # CONFIG_INFINIBAND_IPATH is not set | 1699 | CONFIG_INFINIBAND_IPATH=m |
| 1695 | CONFIG_INFINIBAND_EHCA=m | 1700 | CONFIG_INFINIBAND_EHCA=m |
| 1696 | # CONFIG_INFINIBAND_AMSO1100 is not set | 1701 | # CONFIG_INFINIBAND_AMSO1100 is not set |
| 1697 | # CONFIG_MLX4_INFINIBAND is not set | 1702 | CONFIG_MLX4_INFINIBAND=m |
| 1698 | # CONFIG_INFINIBAND_NES is not set | 1703 | # CONFIG_INFINIBAND_NES is not set |
| 1699 | CONFIG_INFINIBAND_IPOIB=m | 1704 | CONFIG_INFINIBAND_IPOIB=m |
| 1700 | # CONFIG_INFINIBAND_IPOIB_CM is not set | 1705 | CONFIG_INFINIBAND_IPOIB_CM=y |
| 1701 | CONFIG_INFINIBAND_IPOIB_DEBUG=y | 1706 | CONFIG_INFINIBAND_IPOIB_DEBUG=y |
| 1702 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | 1707 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set |
| 1703 | # CONFIG_INFINIBAND_SRP is not set | 1708 | CONFIG_INFINIBAND_SRP=m |
| 1704 | CONFIG_INFINIBAND_ISER=m | 1709 | CONFIG_INFINIBAND_ISER=m |
| 1705 | CONFIG_EDAC=y | 1710 | CONFIG_EDAC=y |
| 1706 | 1711 | ||
| @@ -1798,7 +1803,7 @@ CONFIG_REISERFS_FS=y | |||
| 1798 | CONFIG_REISERFS_FS_XATTR=y | 1803 | CONFIG_REISERFS_FS_XATTR=y |
| 1799 | CONFIG_REISERFS_FS_POSIX_ACL=y | 1804 | CONFIG_REISERFS_FS_POSIX_ACL=y |
| 1800 | CONFIG_REISERFS_FS_SECURITY=y | 1805 | CONFIG_REISERFS_FS_SECURITY=y |
| 1801 | CONFIG_JFS_FS=y | 1806 | CONFIG_JFS_FS=m |
| 1802 | CONFIG_JFS_POSIX_ACL=y | 1807 | CONFIG_JFS_POSIX_ACL=y |
| 1803 | CONFIG_JFS_SECURITY=y | 1808 | CONFIG_JFS_SECURITY=y |
| 1804 | # CONFIG_JFS_DEBUG is not set | 1809 | # CONFIG_JFS_DEBUG is not set |
| @@ -1811,14 +1816,22 @@ CONFIG_XFS_POSIX_ACL=y | |||
| 1811 | # CONFIG_XFS_RT is not set | 1816 | # CONFIG_XFS_RT is not set |
| 1812 | # CONFIG_XFS_DEBUG is not set | 1817 | # CONFIG_XFS_DEBUG is not set |
| 1813 | # CONFIG_GFS2_FS is not set | 1818 | # CONFIG_GFS2_FS is not set |
| 1814 | # CONFIG_OCFS2_FS is not set | 1819 | CONFIG_OCFS2_FS=m |
| 1820 | CONFIG_OCFS2_FS_O2CB=m | ||
| 1821 | CONFIG_OCFS2_FS_STATS=y | ||
| 1822 | CONFIG_OCFS2_DEBUG_MASKLOG=y | ||
| 1823 | # CONFIG_OCFS2_DEBUG_FS is not set | ||
| 1824 | # CONFIG_OCFS2_COMPAT_JBD is not set | ||
| 1825 | CONFIG_BTRFS_FS=m | ||
| 1826 | CONFIG_BTRFS_FS_POSIX_ACL=y | ||
| 1827 | CONFIG_NILFS2_FS=m | ||
| 1815 | CONFIG_DNOTIFY=y | 1828 | CONFIG_DNOTIFY=y |
| 1816 | CONFIG_INOTIFY=y | 1829 | CONFIG_INOTIFY=y |
| 1817 | CONFIG_INOTIFY_USER=y | 1830 | CONFIG_INOTIFY_USER=y |
| 1818 | # CONFIG_QUOTA is not set | 1831 | # CONFIG_QUOTA is not set |
| 1819 | # CONFIG_AUTOFS_FS is not set | 1832 | # CONFIG_AUTOFS_FS is not set |
| 1820 | CONFIG_AUTOFS4_FS=m | 1833 | CONFIG_AUTOFS4_FS=m |
| 1821 | # CONFIG_FUSE_FS is not set | 1834 | CONFIG_FUSE_FS=m |
| 1822 | 1835 | ||
| 1823 | # | 1836 | # |
| 1824 | # CD-ROM/DVD Filesystems | 1837 | # CD-ROM/DVD Filesystems |
| @@ -1851,7 +1864,7 @@ CONFIG_TMPFS=y | |||
| 1851 | # CONFIG_TMPFS_POSIX_ACL is not set | 1864 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 1852 | CONFIG_HUGETLBFS=y | 1865 | CONFIG_HUGETLBFS=y |
| 1853 | CONFIG_HUGETLB_PAGE=y | 1866 | CONFIG_HUGETLB_PAGE=y |
| 1854 | # CONFIG_CONFIGFS_FS is not set | 1867 | CONFIG_CONFIGFS_FS=m |
| 1855 | 1868 | ||
| 1856 | # | 1869 | # |
| 1857 | # Miscellaneous filesystems | 1870 | # Miscellaneous filesystems |
| @@ -2075,7 +2088,7 @@ CONFIG_XMON=y | |||
| 2075 | CONFIG_XMON_DISASSEMBLY=y | 2088 | CONFIG_XMON_DISASSEMBLY=y |
| 2076 | CONFIG_DEBUGGER=y | 2089 | CONFIG_DEBUGGER=y |
| 2077 | CONFIG_IRQSTACKS=y | 2090 | CONFIG_IRQSTACKS=y |
| 2078 | # CONFIG_VIRQ_DEBUG is not set | 2091 | CONFIG_VIRQ_DEBUG=y |
| 2079 | CONFIG_BOOTX_TEXT=y | 2092 | CONFIG_BOOTX_TEXT=y |
| 2080 | # CONFIG_PPC_EARLY_DEBUG is not set | 2093 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 2081 | 2094 | ||
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index ca9ff9aad74a..41de3ddc9f24 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -159,7 +159,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
| 159 | CONFIG_KMOD=y | 159 | CONFIG_KMOD=y |
| 160 | CONFIG_STOP_MACHINE=y | 160 | CONFIG_STOP_MACHINE=y |
| 161 | CONFIG_BLOCK=y | 161 | CONFIG_BLOCK=y |
| 162 | # CONFIG_BLK_DEV_IO_TRACE is not set | 162 | CONFIG_BLK_DEV_IO_TRACE=y |
| 163 | CONFIG_BLK_DEV_BSG=y | 163 | CONFIG_BLK_DEV_BSG=y |
| 164 | # CONFIG_BLK_DEV_INTEGRITY is not set | 164 | # CONFIG_BLK_DEV_INTEGRITY is not set |
| 165 | CONFIG_BLOCK_COMPAT=y | 165 | CONFIG_BLOCK_COMPAT=y |
| @@ -191,6 +191,7 @@ CONFIG_SCANLOG=m | |||
| 191 | CONFIG_LPARCFG=y | 191 | CONFIG_LPARCFG=y |
| 192 | CONFIG_PPC_SMLPAR=y | 192 | CONFIG_PPC_SMLPAR=y |
| 193 | CONFIG_CMM=y | 193 | CONFIG_CMM=y |
| 194 | CONFIG_DTL=y | ||
| 194 | # CONFIG_PPC_ISERIES is not set | 195 | # CONFIG_PPC_ISERIES is not set |
| 195 | # CONFIG_PPC_PMAC is not set | 196 | # CONFIG_PPC_PMAC is not set |
| 196 | # CONFIG_PPC_MAPLE is not set | 197 | # CONFIG_PPC_MAPLE is not set |
| @@ -255,7 +256,8 @@ CONFIG_KEXEC=y | |||
| 255 | # CONFIG_PHYP_DUMP is not set | 256 | # CONFIG_PHYP_DUMP is not set |
| 256 | CONFIG_IRQ_ALL_CPUS=y | 257 | CONFIG_IRQ_ALL_CPUS=y |
| 257 | CONFIG_NUMA=y | 258 | CONFIG_NUMA=y |
| 258 | CONFIG_NODES_SHIFT=4 | 259 | CONFIG_NODES_SHIFT=8 |
| 260 | CONFIG_MAX_ACTIVE_REGIONS=256 | ||
| 259 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 261 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 260 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 262 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 261 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 263 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| @@ -270,7 +272,9 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
| 270 | CONFIG_SPARSEMEM_EXTREME=y | 272 | CONFIG_SPARSEMEM_EXTREME=y |
| 271 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 273 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 272 | CONFIG_SPARSEMEM_VMEMMAP=y | 274 | CONFIG_SPARSEMEM_VMEMMAP=y |
| 273 | # CONFIG_MEMORY_HOTPLUG is not set | 275 | CONFIG_MEMORY_HOTPLUG=y |
| 276 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | ||
| 277 | CONFIG_MEMORY_HOTREMOVE=y | ||
| 274 | CONFIG_PAGEFLAGS_EXTENDED=y | 278 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 275 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 279 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 276 | CONFIG_MIGRATION=y | 280 | CONFIG_MIGRATION=y |
| @@ -705,7 +709,7 @@ CONFIG_MD_LINEAR=y | |||
| 705 | CONFIG_MD_RAID0=y | 709 | CONFIG_MD_RAID0=y |
| 706 | CONFIG_MD_RAID1=y | 710 | CONFIG_MD_RAID1=y |
| 707 | CONFIG_MD_RAID10=m | 711 | CONFIG_MD_RAID10=m |
| 708 | # CONFIG_MD_RAID456 is not set | 712 | CONFIG_MD_RAID456=m |
| 709 | CONFIG_MD_MULTIPATH=m | 713 | CONFIG_MD_MULTIPATH=m |
| 710 | CONFIG_MD_FAULTY=m | 714 | CONFIG_MD_FAULTY=m |
| 711 | CONFIG_BLK_DEV_DM=y | 715 | CONFIG_BLK_DEV_DM=y |
| @@ -800,7 +804,7 @@ CONFIG_ACENIC=m | |||
| 800 | CONFIG_ACENIC_OMIT_TIGON_I=y | 804 | CONFIG_ACENIC_OMIT_TIGON_I=y |
| 801 | # CONFIG_DL2K is not set | 805 | # CONFIG_DL2K is not set |
| 802 | CONFIG_E1000=y | 806 | CONFIG_E1000=y |
| 803 | # CONFIG_E1000E is not set | 807 | CONFIG_E1000E=m |
| 804 | # CONFIG_IP1000 is not set | 808 | # CONFIG_IP1000 is not set |
| 805 | # CONFIG_IGB is not set | 809 | # CONFIG_IGB is not set |
| 806 | # CONFIG_NS83820 is not set | 810 | # CONFIG_NS83820 is not set |
| @@ -818,18 +822,18 @@ CONFIG_TIGON3=y | |||
| 818 | # CONFIG_ATL1E is not set | 822 | # CONFIG_ATL1E is not set |
| 819 | # CONFIG_JME is not set | 823 | # CONFIG_JME is not set |
| 820 | CONFIG_NETDEV_10000=y | 824 | CONFIG_NETDEV_10000=y |
| 821 | # CONFIG_CHELSIO_T1 is not set | 825 | CONFIG_CHELSIO_T1=m |
| 822 | # CONFIG_CHELSIO_T3 is not set | 826 | CONFIG_CHELSIO_T3=m |
| 823 | CONFIG_EHEA=y | 827 | CONFIG_EHEA=y |
| 824 | # CONFIG_ENIC is not set | 828 | # CONFIG_ENIC is not set |
| 825 | # CONFIG_IXGBE is not set | 829 | CONFIG_IXGBE=m |
| 826 | CONFIG_IXGB=m | 830 | CONFIG_IXGB=m |
| 827 | CONFIG_S2IO=m | 831 | CONFIG_S2IO=m |
| 828 | # CONFIG_MYRI10GE is not set | 832 | CONFIG_MYRI10GE=m |
| 829 | # CONFIG_NETXEN_NIC is not set | 833 | CONFIG_NETXEN_NIC=m |
| 830 | # CONFIG_NIU is not set | 834 | # CONFIG_NIU is not set |
| 831 | # CONFIG_MLX4_EN is not set | 835 | CONFIG_MLX4_EN=m |
| 832 | # CONFIG_MLX4_CORE is not set | 836 | CONFIG_MLX4_CORE=m |
| 833 | # CONFIG_TEHUTI is not set | 837 | # CONFIG_TEHUTI is not set |
| 834 | # CONFIG_BNX2X is not set | 838 | # CONFIG_BNX2X is not set |
| 835 | # CONFIG_QLGE is not set | 839 | # CONFIG_QLGE is not set |
| @@ -894,7 +898,7 @@ CONFIG_INPUT_MOUSEDEV=y | |||
| 894 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 898 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 895 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 899 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 896 | # CONFIG_INPUT_JOYDEV is not set | 900 | # CONFIG_INPUT_JOYDEV is not set |
| 897 | # CONFIG_INPUT_EVDEV is not set | 901 | CONFIG_INPUT_EVDEV=m |
| 898 | # CONFIG_INPUT_EVBUG is not set | 902 | # CONFIG_INPUT_EVBUG is not set |
| 899 | 903 | ||
| 900 | # | 904 | # |
| @@ -1271,7 +1275,7 @@ CONFIG_USB_DEVICEFS=y | |||
| 1271 | CONFIG_USB_DEVICE_CLASS=y | 1275 | CONFIG_USB_DEVICE_CLASS=y |
| 1272 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1276 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1273 | # CONFIG_USB_OTG is not set | 1277 | # CONFIG_USB_OTG is not set |
| 1274 | CONFIG_USB_MON=y | 1278 | CONFIG_USB_MON=m |
| 1275 | # CONFIG_USB_WUSB is not set | 1279 | # CONFIG_USB_WUSB is not set |
| 1276 | # CONFIG_USB_WUSB_CBAF is not set | 1280 | # CONFIG_USB_WUSB_CBAF is not set |
| 1277 | 1281 | ||
| @@ -1311,7 +1315,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1311 | # | 1315 | # |
| 1312 | # may also be needed; see USB_STORAGE Help for more information | 1316 | # may also be needed; see USB_STORAGE Help for more information |
| 1313 | # | 1317 | # |
| 1314 | CONFIG_USB_STORAGE=y | 1318 | CONFIG_USB_STORAGE=m |
| 1315 | # CONFIG_USB_STORAGE_DEBUG is not set | 1319 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1316 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1320 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1317 | # CONFIG_USB_STORAGE_FREECOM is not set | 1321 | # CONFIG_USB_STORAGE_FREECOM is not set |
| @@ -1322,7 +1326,7 @@ CONFIG_USB_STORAGE=y | |||
| 1322 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1326 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1323 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1327 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1324 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1328 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1325 | CONFIG_USB_STORAGE_ONETOUCH=y | 1329 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1326 | # CONFIG_USB_STORAGE_KARMA is not set | 1330 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1327 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1331 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1328 | # CONFIG_USB_LIBUSUAL is not set | 1332 | # CONFIG_USB_LIBUSUAL is not set |
| @@ -1377,17 +1381,17 @@ CONFIG_INFINIBAND_USER_MEM=y | |||
| 1377 | CONFIG_INFINIBAND_ADDR_TRANS=y | 1381 | CONFIG_INFINIBAND_ADDR_TRANS=y |
| 1378 | CONFIG_INFINIBAND_MTHCA=m | 1382 | CONFIG_INFINIBAND_MTHCA=m |
| 1379 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | 1383 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
| 1380 | # CONFIG_INFINIBAND_IPATH is not set | 1384 | CONFIG_INFINIBAND_IPATH=m |
| 1381 | CONFIG_INFINIBAND_EHCA=m | 1385 | CONFIG_INFINIBAND_EHCA=m |
| 1382 | # CONFIG_INFINIBAND_AMSO1100 is not set | 1386 | # CONFIG_INFINIBAND_AMSO1100 is not set |
| 1383 | # CONFIG_MLX4_INFINIBAND is not set | 1387 | CONFIG_MLX4_INFINIBAND=m |
| 1384 | # CONFIG_INFINIBAND_NES is not set | 1388 | # CONFIG_INFINIBAND_NES is not set |
| 1385 | CONFIG_INFINIBAND_IPOIB=m | 1389 | CONFIG_INFINIBAND_IPOIB=m |
| 1386 | # CONFIG_INFINIBAND_IPOIB_CM is not set | 1390 | CONFIG_INFINIBAND_IPOIB_CM=y |
| 1387 | CONFIG_INFINIBAND_IPOIB_DEBUG=y | 1391 | CONFIG_INFINIBAND_IPOIB_DEBUG=y |
| 1388 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set | 1392 | # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set |
| 1389 | CONFIG_INFINIBAND_SRP=m | 1393 | CONFIG_INFINIBAND_SRP=m |
| 1390 | # CONFIG_INFINIBAND_ISER is not set | 1394 | CONFIG_INFINIBAND_ISER=m |
| 1391 | # CONFIG_EDAC is not set | 1395 | # CONFIG_EDAC is not set |
| 1392 | # CONFIG_RTC_CLASS is not set | 1396 | # CONFIG_RTC_CLASS is not set |
| 1393 | # CONFIG_DMADEVICES is not set | 1397 | # CONFIG_DMADEVICES is not set |
| @@ -1443,6 +1447,9 @@ CONFIG_OCFS2_FS_STATS=y | |||
| 1443 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1447 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1444 | # CONFIG_OCFS2_DEBUG_FS is not set | 1448 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1445 | # CONFIG_OCFS2_COMPAT_JBD is not set | 1449 | # CONFIG_OCFS2_COMPAT_JBD is not set |
| 1450 | CONFIG_BTRFS_FS=m | ||
| 1451 | CONFIG_BTRFS_FS_POSIX_ACL=y | ||
| 1452 | CONFIG_NILFS2_FS=m | ||
| 1446 | CONFIG_DNOTIFY=y | 1453 | CONFIG_DNOTIFY=y |
| 1447 | CONFIG_INOTIFY=y | 1454 | CONFIG_INOTIFY=y |
| 1448 | CONFIG_INOTIFY_USER=y | 1455 | CONFIG_INOTIFY_USER=y |
| @@ -1455,8 +1462,8 @@ CONFIG_FUSE_FS=m | |||
| 1455 | # CD-ROM/DVD Filesystems | 1462 | # CD-ROM/DVD Filesystems |
| 1456 | # | 1463 | # |
| 1457 | CONFIG_ISO9660_FS=y | 1464 | CONFIG_ISO9660_FS=y |
| 1458 | CONFIG_JOLIET=y | 1465 | # CONFIG_JOLIET is not set |
| 1459 | CONFIG_ZISOFS=y | 1466 | # CONFIG_ZISOFS is not set |
| 1460 | CONFIG_UDF_FS=m | 1467 | CONFIG_UDF_FS=m |
| 1461 | CONFIG_UDF_NLS=y | 1468 | CONFIG_UDF_NLS=y |
| 1462 | 1469 | ||
| @@ -1508,14 +1515,14 @@ CONFIG_NFS_FS=y | |||
| 1508 | CONFIG_NFS_V3=y | 1515 | CONFIG_NFS_V3=y |
| 1509 | CONFIG_NFS_V3_ACL=y | 1516 | CONFIG_NFS_V3_ACL=y |
| 1510 | CONFIG_NFS_V4=y | 1517 | CONFIG_NFS_V4=y |
| 1511 | CONFIG_NFSD=y | 1518 | CONFIG_NFSD=m |
| 1512 | CONFIG_NFSD_V2_ACL=y | 1519 | CONFIG_NFSD_V2_ACL=y |
| 1513 | CONFIG_NFSD_V3=y | 1520 | CONFIG_NFSD_V3=y |
| 1514 | CONFIG_NFSD_V3_ACL=y | 1521 | CONFIG_NFSD_V3_ACL=y |
| 1515 | CONFIG_NFSD_V4=y | 1522 | CONFIG_NFSD_V4=y |
| 1516 | CONFIG_LOCKD=y | 1523 | CONFIG_LOCKD=y |
| 1517 | CONFIG_LOCKD_V4=y | 1524 | CONFIG_LOCKD_V4=y |
| 1518 | CONFIG_EXPORTFS=y | 1525 | CONFIG_EXPORTFS=m |
| 1519 | CONFIG_NFS_ACL_SUPPORT=y | 1526 | CONFIG_NFS_ACL_SUPPORT=y |
| 1520 | CONFIG_NFS_COMMON=y | 1527 | CONFIG_NFS_COMMON=y |
| 1521 | CONFIG_SUNRPC=y | 1528 | CONFIG_SUNRPC=y |
| @@ -1681,12 +1688,12 @@ CONFIG_DYNAMIC_PRINTK_DEBUG=y | |||
| 1681 | CONFIG_HAVE_ARCH_KGDB=y | 1688 | CONFIG_HAVE_ARCH_KGDB=y |
| 1682 | # CONFIG_KGDB is not set | 1689 | # CONFIG_KGDB is not set |
| 1683 | CONFIG_DEBUG_STACKOVERFLOW=y | 1690 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1684 | # CONFIG_DEBUG_STACK_USAGE is not set | 1691 | CONFIG_DEBUG_STACK_USAGE=y |
| 1685 | # CONFIG_DEBUG_PAGEALLOC is not set | 1692 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1686 | # CONFIG_HCALL_STATS is not set | 1693 | # CONFIG_HCALL_STATS is not set |
| 1687 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1694 | CONFIG_CODE_PATCHING_SELFTEST=y |
| 1688 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1695 | CONFIG_FTR_FIXUP_SELFTEST=y |
| 1689 | # CONFIG_MSI_BITMAP_SELFTEST is not set | 1696 | CONFIG_MSI_BITMAP_SELFTEST=y |
| 1690 | CONFIG_XMON=y | 1697 | CONFIG_XMON=y |
| 1691 | CONFIG_XMON_DEFAULT=y | 1698 | CONFIG_XMON_DEFAULT=y |
| 1692 | CONFIG_XMON_DISASSEMBLY=y | 1699 | CONFIG_XMON_DISASSEMBLY=y |
