Skip to content
Snippets Groups Projects
Commit 247473f5 authored by Mutalik Desai, Suprasad's avatar Mutalik Desai, Suprasad Committed by Kenneth Johansson
Browse files

Merge pull request #293 in SW_PON/linux from...

Merge pull request #293 in SW_PON/linux from bugfix/UGW_SW-24400-mips-memset.s-eva-fault-support-for-small-memset to 8.1_ER2

* commit '7847a040dc97a9c79bdfd4e91363df7a231d28ca':
  UGW_SW-24400: mips-memset.s-eva-fault-support-for-small-memset
parent ad154e98
No related branches found
No related tags found
No related merge requests found
......@@ -160,19 +160,19 @@
.Lmemset_partial\@:
R10KCBARRIER(0(ra))
PTR_LA t1, 2f /* where to start */
PTR_LA t2, 2f /* where to start */
#ifdef CONFIG_CPU_MICROMIPS
LONG_SRL t7, t0, 1
#endif
#if LONGSIZE == 4
PTR_SUBU t1, FILLPTRG
PTR_SUBU t2, FILLPTRG
#else
.set noat
LONG_SRL AT, FILLPTRG, 1
PTR_SUBU t1, AT
PTR_SUBU t2, AT
.set at
#endif
jr t1
jr t2
PTR_ADDU a0, t0 /* dest ptr */
.set push
......@@ -218,7 +218,7 @@
1: PTR_ADDIU a0, 1 /* fill bytewise */
R10KCBARRIER(0(ra))
bne t1, a0, 1b
sb a1, -1(a0)
EX(sb, a1, -1(a0), .Lsmall_fixup\@)
2: jr ra /* done */
move a2, zero
......@@ -249,7 +249,6 @@
.Lpartial_fixup\@:
PTR_L t0, TI_TASK($28)
andi a2, STORMASK
LONG_L t0, THREAD_BUADDR(t0)
LONG_ADDU a2, t1
jr ra
......@@ -259,6 +258,11 @@
jr ra
andi v1, a2, STORMASK
.Lsmall_fixup\@:
PTR_SUBU a2, t1, a0
jr ra
PTR_ADDIU a2, 1
.endm
/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment