diff --git a/kernel.spec b/kernel.spec index 52ead69ff..204317de3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -744,9 +744,6 @@ Patch12404: x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patc Patch12407: scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch -# temporary fix for Sempron machines stalling (#704059) -Patch12408: x86-amd-arat-bug-on-sempron-workaround.patch - Patch12415: hid-multitouch-add-support-for-elo-touchsystems.patch Patch12416: bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch @@ -1387,9 +1384,6 @@ ApplyPatch bonding-incorrect-tx-queue-offset.patch ApplyPatch scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch -# temporary fix for Sempron machines stalling (#704059) -ApplyPatch x86-amd-arat-bug-on-sempron-workaround.patch - ApplyPatch hid-multitouch-add-support-for-elo-touchsystems.patch ApplyPatch bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch @@ -2011,6 +2005,7 @@ fi drm-vblank-events-fix-hangs.patch mm-vmscan-correct-use-of-pgdat_balanced-in-sleeping_prematurely.patch mm-vmscan-correctly-check-if-reclaimer-should-schedule-during-shrink_slab.patch +- Drop x86-amd-arat-bug-on-sempron-workaround.patch; the proper fix is in 2.6.38.8 * Sun May 29 2011 Dave Airlie - fix oops on pageflipping sometimes (#680651) diff --git a/x86-amd-arat-bug-on-sempron-workaround.patch b/x86-amd-arat-bug-on-sempron-workaround.patch deleted file mode 100644 index 262293b00..000000000 --- a/x86-amd-arat-bug-on-sempron-workaround.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/arch/x86/kernel/cpu/amd.c -+++ b/arch/x86/kernel/cpu/amd.c -@@ -724,6 +724,15 @@ bool cpu_has_amd_erratum(const int *erra - if (cpu->x86_vendor != X86_VENDOR_AMD) - return false; - -+ /* -+ * Temporary workaround for ARAT bug on Sempron. -+ * The BIOS clears the bit in OSVW, so the check -+ * fails, then ARAT gets set and when the processor -+ * uses C3 it hangs. Always return true for that CPU. -+ */ -+ if (cpu->x86 == 0x10 && cpu->x86_model == 6 && cpu->x86_mask == 2) -+ return true; -+ - if (osvw_id >= 0 && osvw_id < 65536 && - cpu_has(cpu, X86_FEATURE_OSVW)) { - u64 osvw_len;