Commit cade08a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha updates from Matt Turner:
 "They're mostly small janitorial fixes but there's also more important
  ones:

   - drop the alpha-specific x86 binary loader (David Hildenbrand)

   - regression fix for at least Marvel platforms (Mike Rapoport)

   - fix for a scary-looking typo (Zheng Yongjun)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: register early reserved memory in memblock
  alpha: fix spelling mistakes
  alpha: Remove space between * and parameter name
  alpha: fp_emul: avoid init/cleanup_module names
  alpha: Add syscall_get_return_value()
  binfmt: remove support for em86 (alpha only)
  alpha: fix typos in a comment
  alpha: defconfig: add necessary configs for boot testing
  alpha: Send stop IPI to send to online CPUs
  alpha: convert comma to semicolon
  alpha: remove undef inline in compiler.h
  alpha: Kconfig: Replace HTTP links with HTTPS ones
  alpha: __udiv_qrnnd should be exported
parents 7e96bf47 640b7ea5

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ config SMP 
	  will run faster if you say N here.



	  See also the SMP-HOWTO available at

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

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



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

arch/alpha/boot/bootpz.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ extern char _end; 
	START_ADDR	KSEG address of the entry point of kernel code.



	ZERO_PGE	KSEG address of page full of zeroes, but 

			upon entry to kerne cvan be expected

			upon entry to kernel, it can be expected

			to hold the parameter list and possible

			INTRD information.

arch/alpha/boot/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern long srm_printk(const char *, ...) 
     __attribute__ ((format (printf, 1, 2)));



/*

 * gzip delarations

 * gzip declarations

 */

#define OF(args)  args

#define STATIC static

arch/alpha/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ CONFIG_DEBUG_INFO=y 
CONFIG_ALPHA_LEGACY_START_ADDRESS=y

CONFIG_MATHEMU=y

CONFIG_CRYPTO_HMAC=y

CONFIG_DEVTMPFS=y

arch/alpha/include/asm/compiler.h

+0 −11
Original line number Diff line number Diff line
@@ -4,15 +4,4 @@ 


#include <uapi/asm/compiler.h>



/* Some idiots over in <linux/compiler.h> thought inline should imply

   always_inline.  This breaks stuff.  We'll include this file whenever

   we run into such problems.  */



#include <linux/compiler.h>

#undef inline

#undef __inline__

#undef __inline

#undef __always_inline

#define __always_inline		inline __attribute__((always_inline))



#endif /* __ALPHA_COMPILER_H */