From c34c43176a82f16f99da49377f387df81141a1fc Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 31 Oct 2014 13:58:30 +0000
Subject: [PATCH] [i386] Rename 486 flavour to 586 (Closes: #766105)

svn path=/dists/sid/linux/; revision=22004
---
 debian/changelog                |  5 +++--
 debian/config/i386/defines      | 11 ++++-------
 debian/config/i386/none/defines |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5f24c81f..057e68b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,8 +109,9 @@ linux (3.16.7-1) UNRELEASED; urgency=medium
     - [sparc*] Implement __get_user_pages_fast().
 
   [ Ben Hutchings ]
-  * [i386/486] Select M586TSC instead of M486, and update description to say
-    that the processor must have a TSC (see #766105)
+  * [i386] Rename 486 flavour to 586, as it has not worked on 486 processors
+    since we enabled CC_STACKPROTECTOR (Closes: #766105)
+    - Select M586TSC instead of M486
   * [x86] r8723au: Backport changes up to Linux 3.17 (Closes: #765685)
   * mmc_block: Increase max_devices and set MMC_BLOCK_MINORS to 256
     (Closes: #765621)
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index e83044f4c..e71266d96 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -12,9 +12,6 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
  This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
  Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
  Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.
-part-long-tsc: This kernel now requires a TSC (Time Stamp Counter),
- which is supported by Pentium-compatible processors and the
- DM&P/SiS Vortex86.
 
 [image]
 bootloaders: grub-pc extlinux lilo
@@ -24,15 +21,15 @@ install-stem: vmlinuz
 [relations]
 headers%gcc-4.8: linux-compiler-gcc-4.8-x86
 
-[486_description]
+[586_description]
 hardware: older PCs
 hardware-long: PCs with a single processor not supporting PAE
-parts: tsc up
+parts: up
 
-[486_image]
+[586_image]
 configs:
  kernelarch-x86/config-arch-32
- i386/config.486
+ i386/config.586
 
 [686-pae_build]
 debug-info: true
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
index b32c5a48f..0af5a1d90 100644
--- a/debian/config/i386/none/defines
+++ b/debian/config/i386/none/defines
@@ -1,6 +1,6 @@
 [base]
 flavours:
- 486
+ 586
  686-pae
  amd64