Revert r6969 and r6970. It does not follow the smp-only scheme and Dann was
asked to fix that. svn path=/dists/trunk/linux-2.6/; revision=6992
This commit is contained in:
parent
c61f29367b
commit
2e08577aff
|
@ -0,0 +1,12 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
# CONFIG_CPUSETS is not set
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_ITANIUM=y
|
||||
# CONFIG_MCKINLEY is not set
|
||||
CONFIG_IA64_BRL_EMU=y
|
||||
CONFIG_IA64_L1_CACHE_SHIFT=6
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=64
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
|
@ -0,0 +1,11 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
# CONFIG_CPUSETS is not set
|
||||
CONFIG_STOP_MACHINE=y
|
||||
# CONFIG_ITANIUM is not set
|
||||
CONFIG_MCKINLEY=y
|
||||
CONFIG_IA64_L1_CACHE_SHIFT=7
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=64
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
|
@ -1,7 +1,9 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
itanium
|
||||
itanium-smp
|
||||
mckinley
|
||||
mckinley-smp
|
||||
kernel-arch: ia64
|
||||
kernel-header-dirs: ia64
|
||||
|
@ -9,9 +11,15 @@ kernel-header-dirs: ia64
|
|||
[image]
|
||||
suggests: elilo, fdutils
|
||||
|
||||
[itanium]
|
||||
class: Itanium
|
||||
|
||||
[itanium-smp]
|
||||
class: multi-processor Itanium
|
||||
|
||||
[mckinley]
|
||||
class: Itanium II
|
||||
|
||||
[mckinley-smp]
|
||||
class: multi-processor Itanium II
|
||||
|
||||
|
|
|
@ -43,13 +43,6 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low
|
|||
[ Sven Luther ]
|
||||
* Re-enabled fs-asfs patch.
|
||||
|
||||
[ dann frazier ]
|
||||
* [ia64] Drop the non-SMP flavours; they are not well maintained upstream.
|
||||
Note that the non-SMP flavours have been identical to the SMP builds
|
||||
since 2.6.13-1; this was to avoid having to drop then re-add these
|
||||
flavours if upstream resolved the issue - but that never happened.
|
||||
Note that this is a measurable performance penalty on non-SMP systems.
|
||||
|
||||
[ Thiemo Seufer ]
|
||||
* [mips,mipsel] Fix sb1 interrupt handlers.
|
||||
* [mips,mipsel] Fix devfs-induced build failure in sb1250 serial driver.
|
||||
|
|
|
@ -90,7 +90,7 @@ X-Version-Overwrite-Epoch: 1
|
|||
Architecture: ia64
|
||||
Section: base
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-itanium-smp
|
||||
Depends: linux-image-2.6-itanium
|
||||
Description: Linux kernel 2.6 image on Itanium machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
|
@ -108,7 +108,7 @@ X-Version-Overwrite-Epoch: 1
|
|||
Architecture: ia64
|
||||
Section: base
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-mckinley-smp
|
||||
Depends: linux-image-2.6-mckinley
|
||||
Description: Linux kernel 2.6 image on Itanium II machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
|
|
Loading…
Reference in New Issue