summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/trap_block.h
diff options
context:
space:
mode:
authorKhalid Aziz <khalid.aziz@oracle.com>2015-05-27 19:00:46 +0300
committerDavid S. Miller <davem@davemloft.net>2015-06-01 08:15:01 +0300
commit494e5b6faeda1d1e830a13e10b3c7bc323f35d97 (patch)
tree612e28b6b6678d133d960b9241401aa0e8ddc98d /arch/sparc/include/asm/trap_block.h
parentf0c1a1173773a56d500f1814893e63f97580f76a (diff)
downloadlinux-494e5b6faeda1d1e830a13e10b3c7bc323f35d97.tar.xz
sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE
sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE Bit 9 of TTE is CV (Cacheable in V-cache) on sparc v9 processor while the same bit 9 is MCDE (Memory Corruption Detection Enable) on M7 processor. This creates a conflicting usage of the same bit. Kernel sets TTE.cv bit on all pages for sun4v architecture which works well for sparc v9 but enables memory corruption detection on M7 processor which is not the intent. This patch adds code to determine if kernel is running on M7 processor and takes steps to not enable memory corruption detection in TTE erroneously. Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/trap_block.h')
-rw-r--r--arch/sparc/include/asm/trap_block.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
index 6fd4436d32f0..ec9c04de3664 100644
--- a/arch/sparc/include/asm/trap_block.h
+++ b/arch/sparc/include/asm/trap_block.h
@@ -79,6 +79,8 @@ struct sun4v_2insn_patch_entry {
};
extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
__sun4v_2insn_patch_end;
+extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
+ __sun_m7_2insn_patch_end;
#endif /* !(__ASSEMBLY__) */