Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 244cce14 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 fixes from Matt Turner:
 "A few changes for alpha, including a build fix, a fix for the Eiger
  platform, and a fix for a tricky bug uncovered by the strace test
  suite that has existed since at least 1997 (v2.1.32)!"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: fix page fault handling for r16-r18 targets
  alpha: Fix Eiger NR_IRQS to 128
  tools uapi: fix Alpha support
parents 1413d9af 491af60f

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,

tools/include/uapi/asm/bitsperlong.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "../../arch/ia64/include/uapi/asm/bitsperlong.h"

#elif defined(__riscv)

#include "../../arch/riscv/include/uapi/asm/bitsperlong.h"

#elif defined(__alpha__)

#include "../../arch/alpha/include/uapi/asm/bitsperlong.h"

#else

#include <asm-generic/bitsperlong.h>

#endif