path: root/arch/sparc/kernel/head_64.S
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-17 20:21:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-17 20:21:44 -0800
commit1deab8ce2c91e3b16563b7a7ea150f82334262ec (patch)
tree954b2d9d27df9765b9579b10f87054e1effd6cb3 /arch/sparc/kernel/head_64.S
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentsparc64: Fix page table walk for PUD hugepages (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller: 1) Add missing cmpxchg64() for 32-bit sparc. 2) Timer conversions from Allen Pais and Kees Cook. 3) vDSO support, from Nagarathnam Muthusamy. 4) Fix sparc64 huge page table walks based upon bug report by Al Viro, from Nitin Gupta. 5) Optimized fls() for T4 and above, from Vijay Kumar. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix page table walk for PUD hugepages sparc64: Convert timers to user timer_setup() sparc64: convert mdesc_handle.refcnt from atomic_t to refcount_t sparc/led: Convert timers to use timer_setup() sparc64: Use sparc optimized fls and __fls for T4 and above sparc64: SPARC optimized __fls function sparc64: SPARC optimized fls function sparc64: Define SPARC default __fls function sparc64: Define SPARC default fls function vDSO for sparc sparc32: Add cmpxchg64(). sbus: char: Move D7S_MINOR to include/linux/miscdevice.h sparc: time: Remove unneeded linux/miscdevice.h include sparc64: mmu_context: Add missing include files
Diffstat (limited to 'arch/sparc/kernel/head_64.S')
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index 9e293de12052..a41e6e16eb36 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -641,6 +641,8 @@ niagara4_patch:
call niagara4_patch_pageops
+ call niagara4_patch_fls
+ nop
ba,a,pt %xcc, 80f