diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-23 19:20:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-23 19:20:12 -0700 |
| commit | 33e17876ea4edcd7f5c01efa78e8d02889261abf (patch) | |
| tree | 3b192cd2314bd0e118ca55a2be17693407e176f7 /drivers/crypto | |
| parent | d475fac95779577afefbad312c8635c29fe4441c (diff) | |
| parent | 2b7403035459c75e193c6b04a293e518a4212de0 (diff) | |
| download | linux-33e17876ea4edcd7f5c01efa78e8d02889261abf.tar.bz2 | |
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton:
- the rest of MM
- various misc fixes and tweaks
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
mm: Change return type int to vm_fault_t for fault handlers
lib/fonts: convert comments to utf-8
s390: ebcdic: convert comments to UTF-8
treewide: convert ISO_8859-1 text comments to utf-8
drivers/gpu/drm/gma500/: change return type to vm_fault_t
docs/core-api: mm-api: add section about GFP flags
docs/mm: make GFP flags descriptions usable as kernel-doc
docs/core-api: split memory management API to a separate file
docs/core-api: move *{str,mem}dup* to "String Manipulation"
docs/core-api: kill trailing whitespace in kernel-api.rst
mm/util: add kernel-doc for kvfree
mm/util: make strndup_user description a kernel-doc comment
fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds
treewide: correct "differenciate" and "instanciate" typos
fs/afs: use new return type vm_fault_t
drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t
mm: soft-offline: close the race against page allocation
mm: fix race on soft-offlining free huge pages
namei: allow restricted O_CREAT of FIFOs and regular files
hfs: prevent crash on exit from failed search
...
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/vmx/ghashp8-ppc.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/vmx/ghashp8-ppc.pl b/drivers/crypto/vmx/ghashp8-ppc.pl index f746af271460..38b06503ede0 100644 --- a/drivers/crypto/vmx/ghashp8-ppc.pl +++ b/drivers/crypto/vmx/ghashp8-ppc.pl @@ -129,9 +129,9 @@ $code=<<___; le?vperm $IN,$IN,$IN,$lemask vxor $zero,$zero,$zero - vpmsumd $Xl,$IN,$Hl # H.lo稾i.lo - vpmsumd $Xm,$IN,$H # H.hi稾i.lo+H.lo稾i.hi - vpmsumd $Xh,$IN,$Hh # H.hi稾i.hi + vpmsumd $Xl,$IN,$Hl # H.lo路Xi.lo + vpmsumd $Xm,$IN,$H # H.hi路Xi.lo+H.lo路Xi.hi + vpmsumd $Xh,$IN,$Hh # H.hi路Xi.hi vpmsumd $t2,$Xl,$xC2 # 1st phase @@ -187,11 +187,11 @@ $code=<<___; .align 5 Loop: subic $len,$len,16 - vpmsumd $Xl,$IN,$Hl # H.lo稾i.lo + vpmsumd $Xl,$IN,$Hl # H.lo路Xi.lo subfe. r0,r0,r0 # borrow?-1:0 - vpmsumd $Xm,$IN,$H # H.hi稾i.lo+H.lo稾i.hi + vpmsumd $Xm,$IN,$H # H.hi路Xi.lo+H.lo路Xi.hi and r0,r0,$len - vpmsumd $Xh,$IN,$Hh # H.hi稾i.hi + vpmsumd $Xh,$IN,$Hh # H.hi路Xi.hi add $inp,$inp,r0 vpmsumd $t2,$Xl,$xC2 # 1st phase |