This is a note to let you know that I've just added the patch titled
sparc64: Only Panther cheetah+ chips have POPC.
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sparc64-only-panther-cheetah-chips-have-popc.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From 1a8e0da5937a6c87807083baa318cf8f98dac9aa Mon Sep 17 00:00:00 2001
From: "David S. Miller" <da...@davemloft.net>
Date: Mon, 29 Aug 2011 21:14:29 -0700
Subject: sparc64: Only Panther cheetah+ chips have POPC.
From: "David S. Miller" <da...@davemloft.net>
commit 1a8e0da5937a6c87807083baa318cf8f98dac9aa upstream.
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
arch/sparc/kernel/setup_64.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -440,8 +440,14 @@ static void __init init_sparc64_elf_hwca
cap |= AV_SPARC_VIS;
if (tlb_type == cheetah || tlb_type == cheetah_plus)
cap |= AV_SPARC_VIS | AV_SPARC_VIS2;
- if (tlb_type == cheetah_plus)
- cap |= AV_SPARC_POPC;
+ if (tlb_type == cheetah_plus) {
+ unsigned long impl, ver;
+
+ __asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));
+ impl = ((ver >> 32) & 0xffff);
+ if (impl == PANTHER_IMPL)
+ cap |= AV_SPARC_POPC;
+ }
if (tlb_type == hypervisor) {
if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1)
cap |= AV_SPARC_ASI_BLK_INIT;
Patches currently in stable-queue which might be from da...@davemloft.net are
queue-3.0/sparc-allow-handling-signals-when-stack-is-corrupted.patch
queue-3.0/sparc64-remove-unnecessary-macros-from-spinlock_64.h.patch
queue-3.0/sparc32-sun4d-change-ipi-irq-level-to-prevent-collision.patch
queue-3.0/kernel-printk-do-not-turn-off-bootconsole-in-printk_late_init-if-keep_bootcon.patch
queue-3.0/sparc-fix-array-bounds-error-setting-up-pcic-nmi-trap.patch
queue-3.0/sparc64-set-have_c_recordmcount.patch
queue-3.0/sparc32-unbreak-arch_write_unlock.patch
queue-3.0/ibmveth-fix-leak-when-recycling-skb-and-hypervisor-returns.patch
queue-3.0/sparc64-only-panther-cheetah-chips-have-popc.patch
queue-3.0/sendmmsg-sendmsg-fix-unsafe-user-pointer-access.patch
queue-3.0/atm-br2684-fix-oops-due-to-skb-dev-being-null.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
