ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-22 20:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org:/pub/scm/linux/kernel/git/davem/sparc

Browse Source 
Pull sparc fixes from David Miller:
 "Fix opcode filtering for exceptions, and clean up defconfig"

* git://git.kernel.org:/pub/scm/linux/kernel/git/davem/sparc:
  sparc: sparc64_defconfig: remove duplicate CONFIGs
  sparc64: Fix opcode filtering in handling of no fault loads
This commit is contained in:
Linus Torvalds
2021-03-09 17:08:41 -08:00
parent 4b3d9f9cf1 69264b4a43
commit 6a30bedfdf
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/configs/sparc64_defconfig
View File

@@ -93,7 +93,7 @@ CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_MII=m CONFIG_MII=m
CONFIG_SUNLANCE=m CONFIG_SUNLANCE=m
CONFIG_HAPPYMEAL=m CONFIG_HAPPYMEAL=y
CONFIG_SUNGEM=m CONFIG_SUNGEM=m
CONFIG_SUNVNET=m CONFIG_SUNVNET=m
CONFIG_LDMVSW=m CONFIG_LDMVSW=m
@@ -234,9 +234,7 @@ CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRC16=m CONFIG_CRC16=m
CONFIG_LIBCRC32C=m CONFIG_LIBCRC32C=m
CONFIG_VCC=m CONFIG_VCC=m
CONFIG_ATA=y
CONFIG_PATA_CMD64X=y CONFIG_PATA_CMD64X=y
CONFIG_HAPPYMEAL=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_DHCP=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y

13
arch/sparc/kernel/traps_64.c
View File

@@ -275,14 +275,13 @@ bool is_no_fault_exception(struct pt_regs *regs)
asi = (regs->tstate >> 24); /* saved %asi */ asi = (regs->tstate >> 24); /* saved %asi */
else else
asi = (insn >> 5); /* immediate asi */ asi = (insn >> 5); /* immediate asi */
if ((asi & 0xf2) == ASI_PNF) { if ((asi & 0xf6) == ASI_PNF) {
if (insn & 0x1000000) { /* op3[5:4]=3 */ if (insn & 0x200000) /* op3[2], stores */
handle_ldf_stq(insn, regs);
return true;
} else if (insn & 0x200000) { /* op3[2], stores */
return false; return false;
} if (insn & 0x1000000) /* op3[5:4]=3 (fp) */
handle_ld_nf(insn, regs); handle_ldf_stq(insn, regs);
else
handle_ld_nf(insn, regs);
return true; return true;
} }
} }