diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 13:08:06 -0500 |
| commit | a7cb7bb664543e4562ab0e9a072470d2d18c761f (patch) | |
| tree | 7c72fbbc681617be8c89b63c7e98a7e7b09c72de /arch/powerpc/lib | |
| parent | ccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina:
"Usual stuff: documentation updates, printk() fixes, etc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
intel_ips: fix a type in error message
cpufreq: cpufreq-dt: Move newline to end of error message
ps3rom: fix error return code
treewide: fix typo in printk and Kconfig
ARM: dts: bcm63138: change "interupts" to "interrupts"
Replace mentions of "list_struct" to "list_head"
kernel: trace: fix printk message
scsi: mpt2sas: fix ioctl in comment
zbud, zswap: change module author email
clocksource: Fix 'clcoksource' typo in comment
arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
gpio: msm-v1: make boolean argument more obvious
usb: Fix typo in usb-serial-simple.c
PCI: Fix comment typo 'COMFIG_PM_OPS'
powerpc: Fix comment typo 'CONIFG_8xx'
powerpc: Fix comment typos 'CONFiG_ALTIVEC'
clk: st: Spelling s/stucture/structure/
isci: Spelling s/stucture/structure/
usb: gadget: zero: Spelling s/infrastucture/infrastructure/
treewide: Fix company name in module descriptions
...
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/copyuser_power7.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/memcpy_power7.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index c46c876ac96a..92ee840529bc 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S | |||
| @@ -718,4 +718,4 @@ err3; stb r0,0(r3) | |||
| 718 | 718 | ||
| 719 | 15: addi r1,r1,STACKFRAMESIZE | 719 | 15: addi r1,r1,STACKFRAMESIZE |
| 720 | b exit_vmx_usercopy /* tail call optimise */ | 720 | b exit_vmx_usercopy /* tail call optimise */ |
| 721 | #endif /* CONFiG_ALTIVEC */ | 721 | #endif /* CONFIG_ALTIVEC */ |
diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S index 2ff5c142f87b..0830587df16e 100644 --- a/arch/powerpc/lib/memcpy_power7.S +++ b/arch/powerpc/lib/memcpy_power7.S | |||
| @@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7) | |||
| 653 | 15: addi r1,r1,STACKFRAMESIZE | 653 | 15: addi r1,r1,STACKFRAMESIZE |
| 654 | ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1) | 654 | ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1) |
| 655 | b exit_vmx_copy /* tail call optimise */ | 655 | b exit_vmx_copy /* tail call optimise */ |
| 656 | #endif /* CONFiG_ALTIVEC */ | 656 | #endif /* CONFIG_ALTIVEC */ |