revert r6968 - this is frozen for the next d-i beta, and the plan is to move to 2.6.17 after that

svn path=/dists/sid/linux-2.6.16/; revision=6976

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

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

debian/arch/ia64/defines

@@ -1,6 +1,8 @@
 [base]
 flavours:
+ itanium
  itanium-smp
+ mckinley
  mckinley-smp
 kernel-arch: ia64
 kernel-header-dirs: ia64
@@ -8,9 +10,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
 

debian/changelog

@@ -1,13 +1,3 @@
-linux-2.6.16 (2.6.16-17) UNRELEASED; urgency=low
-
-  * [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.
-
- -- dann frazier <dannf@debian.org>  Sat,  8 Jul 2006 21:16:59 -0600
-
 linux-2.6.16 (2.6.16-16) unstable; urgency=low
 
   [ Sven Luther ]