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

Commit dd689a68 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 update from Matt Turner:
 "A few fixes and wires up some additional syscalls."

[ Some of this is technically not really rc7 material, but it's alpha,
  and it all looks safe anyway. Matt explains: "My alpha has been
  offline, hence the very late-in-cycle pull request" and hasn't caused
  problems before, so he gets to slide.   - Linus ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
  alpha: Define ioremap_wc
  alpha: Fix section mismatches
  alpha: support R_ALPHA_REFLONG relocations for module loading
  alpha: Fix typo in ev6-copy_user.S
  alpha: Package string routines together
  alpha: Update for new syscalls
  alpha: Fix build error without CONFIG_VGA_HOSE.
parents 36fde05f cec80d82

arch/alpha/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static inline void __iomem * ioremap_nocache(unsigned long offset, 
	return ioremap(offset, size);

}



#define ioremap_wc ioremap_nocache

#define ioremap_uc ioremap_nocache



static inline void iounmap(volatile void __iomem *addr)

arch/alpha/include/asm/types.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_TYPES_H

#define _ALPHA_TYPES_H



#include <asm-generic/int-ll64.h>

#include <uapi/asm/types.h>



#endif /* _ALPHA_TYPES_H */

arch/alpha/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <uapi/asm/unistd.h>



#define NR_SYSCALLS			514

#define NR_SYSCALLS			523



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64

arch/alpha/include/uapi/asm/types.h

+11 −1
Original line number Diff line number Diff line
@@ -9,8 +9,18 @@ 
 * need to be careful to avoid a name clashes.

 */



#ifndef __KERNEL__

/*

 * This is here because we used to use l64 for alpha

 * and we don't want to impact user mode with our change to ll64

 * in the kernel.

 *

 * However, some user programs are fine with this.  They can

 * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.

 */

#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__)

#include <asm-generic/int-l64.h>

#else

#include <asm-generic/int-ll64.h>

#endif



#endif /* _UAPI_ALPHA_TYPES_H */

arch/alpha/include/uapi/asm/unistd.h

+14 −0
Original line number Diff line number Diff line
@@ -475,5 +475,19 @@ 
#define __NR_getrandom			511

#define __NR_memfd_create		512

#define __NR_execveat			513

#define __NR_seccomp			514

#define __NR_bpf			515

#define __NR_userfaultfd		516

#define __NR_membarrier			517

#define __NR_mlock2			518

#define __NR_copy_file_range		519

#define __NR_preadv2			520

#define __NR_pwritev2			521

#define __NR_statx			522



/* Alpha doesn't have protection keys. */

#define __IGNORE_pkey_mprotect

#define __IGNORE_pkey_alloc

#define __IGNORE_pkey_free



#endif /* _UAPI_ALPHA_UNISTD_H */