Commit 6dd580b9 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:
 "A host of mall cleanups and adjustments that have accumulated while I
  was away, nothing major"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (26 commits)
  sparc: make xchg() into a statement expression
  sparc64: Use arch_validate_flags() to validate ADI flag
  sparc32: Fix comparing pointer to 0 coccicheck warning
  sparc: fix led.c driver when PROC_FS is not enabled
  sparc: Fix handling of page table constructor failure
  sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set
  tty: hvcs: Drop unnecessary if block
  tty: vcc: Drop unnecessary if block
  tty: vcc: Drop impossible to hit WARN_ON
  sparc: sparc64_defconfig: add necessary configs for qemu
  sparc64: switch defconfig from the legacy ide driver to libata
  sparc32: Preserve clone syscall flags argument for restarts due to signals
  sparc32: Limit memblock allocation to low memory
  sparc: Replace test_ti_thread_flag() with test_tsk_thread_flag()
  sbus: char: Remove meaningless jump label out_free
  sparc32: signal: Fix stack trampoline for RT signals
  sparc: remove SA_STATIC_ALLOC macro definition
  sparc: use for_each_child_of_node() macro
  sparc: Use fallthrough pseudo-keyword
  sparc32: srmmu: improve type safety of __nocache_fix()
  ...
parents 143983e5 356184fb

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ config SMP 
	  Management" code will be disabled if you say Y here.



	  See also <file:Documentation/admin-guide/lockup-watchdogs.rst> and the SMP-HOWTO

	  available at <http://www.tldp.org/docs.html#howto>.

	  available at <https://www.tldp.org/docs.html#howto>.



	  If you don't know what to do here, say N.

arch/sparc/boot/piggyback.c

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ static off_t get_hdrs_offset(int kernelfd, const char *filename) 
		offset -= LOOKBACK;

		/* skip a.out header */

		offset += AOUT_TEXT_OFFSET;

		if (offset < 0) {

			errno = -EINVAL;

			die("Calculated a negative offset, probably elftoaout generated an invalid image. Did you use a recent elftoaout ?");

		}

		if (lseek(kernelfd, offset, SEEK_SET) < 0)

			die("lseek");

		if (read(kernelfd, buffer, BUFSIZE) != BUFSIZE)

arch/sparc/configs/sparc64_defconfig

+8 −3
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ CONFIG_CDROM_PKTCDVD=m 
CONFIG_CDROM_PKTCDVD_WCACHE=y

CONFIG_ATA_OVER_ETH=m

CONFIG_SUNVDC=m

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_ALI15X3=y

CONFIG_ATA=y

CONFIG_PATA_ALI=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -235,3 +234,9 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRC16=m

CONFIG_LIBCRC32C=m

CONFIG_VCC=m

CONFIG_ATA=y

CONFIG_PATA_CMD64X=y

CONFIG_HAPPYMEAL=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_DEVTMPFS=y

arch/sparc/include/asm/backoff.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 *

 * When we spin, we try to use an operation that will cause the

 * current cpu strand to block, and therefore make the core fully

 * available to any other other runnable strands.  There are two

 * available to any other runnable strands.  There are two

 * options, based upon cpu capabilities.

 *

 * On all cpus prior to SPARC-T4 we do three dummy reads of the

arch/sparc/include/asm/cmpxchg_32.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int 
	return x;

}



#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))

#define xchg(ptr,x) ({(__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)));})



/* Emulate cmpxchg() the same way we emulate atomics,

 * by hashing the object address and indexing into an array