Commit 1deab8ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 81700247 70f3c8b7

arch/sparc/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ obj-y += mm/ 
obj-y += math-emu/

obj-y += net/

obj-y += crypto/

obj-$(CONFIG_SPARC64) += vdso/

arch/sparc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ config SPARC64 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select GENERIC_TIME_VSYSCALL

	select ARCH_CLOCKSOURCE_DATA



config ARCH_DEFCONFIG

	string

arch/sparc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ install: 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/sparc/vdso $@



# This is the image used for packaging

KBUILD_IMAGE := $(boot)/zImage

arch/sparc/include/asm/bitops_64.h

+3 −2
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ void set_bit(unsigned long nr, volatile unsigned long *addr); 
void clear_bit(unsigned long nr, volatile unsigned long *addr);

void change_bit(unsigned long nr, volatile unsigned long *addr);



int fls(unsigned int word);

int __fls(unsigned long word);



#include <asm-generic/bitops/non-atomic.h>



#include <asm-generic/bitops/fls.h>

#include <asm-generic/bitops/__fls.h>

#include <asm-generic/bitops/fls64.h>



#ifdef __KERNEL__

arch/sparc/include/asm/clocksource.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.

 */



#ifndef _ASM_SPARC_CLOCKSOURCE_H

#define _ASM_SPARC_CLOCKSOURCE_H



/* VDSO clocksources */

#define VCLOCK_NONE   0  /* Nothing userspace can do. */

#define VCLOCK_TICK   1  /* Use %tick.  */

#define VCLOCK_STICK  2  /* Use %stick. */



struct arch_clocksource_data {

	int vclock_mode;

};



#endif /* _ASM_SPARC_CLOCKSOURCE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE