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

5 files changed, 33 insertions, 9 deletions

diff --git a/debian/arch/ia64/config.itanium b/debian/arch/ia64/config.itanium
new file mode 100644
index 000000000000..715800ed94df
--- /dev/null
+++ b/debian/arch/ia64/config.itanium
@@ -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
diff --git a/debian/arch/ia64/config.mckinley b/debian/arch/ia64/config.mckinley
new file mode 100644
index 000000000000..2e657e4c3424
--- /dev/null
+++ b/debian/arch/ia64/config.mckinley
@@ -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
diff --git a/debian/arch/ia64/defines b/debian/arch/ia64/defines
index 5cdf987c5b58..99cddf8679ff 100644
--- a/debian/arch/ia64/defines
+++ b/debian/arch/ia64/defines
@@ -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
 
diff --git a/debian/changelog b/debian/changelog
index e99ced66e989..c8b13925846b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index 552d2d4daa6f..2016a566694a 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -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.