diff options
author | Robin Holt <holt@sgi.com> | 2008-08-02 14:35:27 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-08-04 14:13:21 -0400 |
commit | ceffacc1d6041392d1b47750b14bf6845c2372ab (patch) | |
tree | 6229ec4d71fda962875a38fe253f461393cc0264 /arch/ia64 | |
parent | ac0af91ebcaedc1a9e1d2987ecbd22837924e6b9 (diff) |
[IA64] update generic_defconfig to support sn2.
This patch changes the generic_defconfig so it works on all sn2
platforms I have access to. There is only one support configuration
which was not tested and that configuration is only a combination of two
tested configurations. With this patchset applied, a generic kernel can
be booted on either a RHEL 5.2, RHEL5.3, or SLES10 SP1 root and operate.
All features needed by SGI's ProPack are also working. I have not
tested all features of RHEL or SLES, but they do at least boot.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/configs/generic_defconfig | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 3ad1a464fd41..133089be5f2e 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_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.27-rc1 | 3 | # Linux kernel version: 2.6.27-rc1 |
4 | # Fri Aug 1 19:33:14 2008 | 4 | # Sat Aug 2 13:24:08 2008 |
5 | # | 5 | # |
6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
7 | 7 | ||
@@ -23,10 +23,17 @@ CONFIG_POSIX_MQUEUE=y | |||
23 | CONFIG_IKCONFIG=y | 23 | CONFIG_IKCONFIG=y |
24 | CONFIG_IKCONFIG_PROC=y | 24 | CONFIG_IKCONFIG_PROC=y |
25 | CONFIG_LOG_BUF_SHIFT=20 | 25 | CONFIG_LOG_BUF_SHIFT=20 |
26 | # CONFIG_CGROUPS is not set | 26 | CONFIG_CGROUPS=y |
27 | # CONFIG_CGROUP_DEBUG is not set | ||
28 | # CONFIG_CGROUP_NS is not set | ||
29 | # CONFIG_CGROUP_DEVICE is not set | ||
30 | CONFIG_CPUSETS=y | ||
27 | # CONFIG_GROUP_SCHED is not set | 31 | # CONFIG_GROUP_SCHED is not set |
32 | # CONFIG_CGROUP_CPUACCT is not set | ||
33 | # CONFIG_RESOURCE_COUNTERS is not set | ||
28 | CONFIG_SYSFS_DEPRECATED=y | 34 | CONFIG_SYSFS_DEPRECATED=y |
29 | CONFIG_SYSFS_DEPRECATED_V2=y | 35 | CONFIG_SYSFS_DEPRECATED_V2=y |
36 | CONFIG_PROC_PID_CPUSET=y | ||
30 | # CONFIG_RELAY is not set | 37 | # CONFIG_RELAY is not set |
31 | CONFIG_NAMESPACES=y | 38 | CONFIG_NAMESPACES=y |
32 | # CONFIG_UTS_NS is not set | 39 | # CONFIG_UTS_NS is not set |
@@ -130,6 +137,7 @@ CONFIG_DMI=y | |||
130 | CONFIG_EFI=y | 137 | CONFIG_EFI=y |
131 | CONFIG_GENERIC_IOMAP=y | 138 | CONFIG_GENERIC_IOMAP=y |
132 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 139 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
140 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | ||
133 | CONFIG_AUDIT_ARCH=y | 141 | CONFIG_AUDIT_ARCH=y |
134 | CONFIG_IA64_GENERIC=y | 142 | CONFIG_IA64_GENERIC=y |
135 | # CONFIG_IA64_DIG is not set | 143 | # CONFIG_IA64_DIG is not set |
@@ -158,7 +166,7 @@ CONFIG_IOSAPIC=y | |||
158 | CONFIG_FORCE_MAX_ZONEORDER=17 | 166 | CONFIG_FORCE_MAX_ZONEORDER=17 |
159 | # CONFIG_VIRT_CPU_ACCOUNTING is not set | 167 | # CONFIG_VIRT_CPU_ACCOUNTING is not set |
160 | CONFIG_SMP=y | 168 | CONFIG_SMP=y |
161 | CONFIG_NR_CPUS=512 | 169 | CONFIG_NR_CPUS=4096 |
162 | CONFIG_HOTPLUG_CPU=y | 170 | CONFIG_HOTPLUG_CPU=y |
163 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 171 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
164 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 172 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
@@ -369,7 +377,8 @@ CONFIG_EXTRA_FIRMWARE="" | |||
369 | # CONFIG_DEBUG_DRIVER is not set | 377 | # CONFIG_DEBUG_DRIVER is not set |
370 | # CONFIG_DEBUG_DEVRES is not set | 378 | # CONFIG_DEBUG_DEVRES is not set |
371 | # CONFIG_SYS_HYPERVISOR is not set | 379 | # CONFIG_SYS_HYPERVISOR is not set |
372 | # CONFIG_CONNECTOR is not set | 380 | CONFIG_CONNECTOR=y |
381 | CONFIG_PROC_EVENTS=y | ||
373 | # CONFIG_MTD is not set | 382 | # CONFIG_MTD is not set |
374 | # CONFIG_PARPORT is not set | 383 | # CONFIG_PARPORT is not set |
375 | CONFIG_PNP=y | 384 | CONFIG_PNP=y |
@@ -403,7 +412,7 @@ CONFIG_MISC_DEVICES=y | |||
403 | CONFIG_SGI_IOC4=y | 412 | CONFIG_SGI_IOC4=y |
404 | # CONFIG_TIFM_CORE is not set | 413 | # CONFIG_TIFM_CORE is not set |
405 | # CONFIG_ENCLOSURE_SERVICES is not set | 414 | # CONFIG_ENCLOSURE_SERVICES is not set |
406 | # CONFIG_SGI_XP is not set | 415 | CONFIG_SGI_XP=m |
407 | # CONFIG_HP_ILO is not set | 416 | # CONFIG_HP_ILO is not set |
408 | CONFIG_SGI_GRU=m | 417 | CONFIG_SGI_GRU=m |
409 | # CONFIG_SGI_GRU_DEBUG is not set | 418 | # CONFIG_SGI_GRU_DEBUG is not set |
@@ -1172,7 +1181,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
1172 | # CONFIG_RTC_CLASS is not set | 1181 | # CONFIG_RTC_CLASS is not set |
1173 | # CONFIG_DMADEVICES is not set | 1182 | # CONFIG_DMADEVICES is not set |
1174 | # CONFIG_UIO is not set | 1183 | # CONFIG_UIO is not set |
1175 | # CONFIG_MSPEC is not set | 1184 | CONFIG_MSPEC=m |
1176 | 1185 | ||
1177 | # | 1186 | # |
1178 | # File systems | 1187 | # File systems |
@@ -1375,6 +1384,7 @@ CONFIG_CRC_ITU_T=m | |||
1375 | CONFIG_CRC32=y | 1384 | CONFIG_CRC32=y |
1376 | # CONFIG_CRC7 is not set | 1385 | # CONFIG_CRC7 is not set |
1377 | # CONFIG_LIBCRC32C is not set | 1386 | # CONFIG_LIBCRC32C is not set |
1387 | CONFIG_GENERIC_ALLOCATOR=y | ||
1378 | CONFIG_PLIST=y | 1388 | CONFIG_PLIST=y |
1379 | CONFIG_HAS_IOMEM=y | 1389 | CONFIG_HAS_IOMEM=y |
1380 | CONFIG_HAS_IOPORT=y | 1390 | CONFIG_HAS_IOPORT=y |