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

Commit 90785be3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'alpha' (alpha architecture patches) 

Merge alpha architecture update from Michael Cree:
 "The Alpha Maintainer, Matt Turner, is currently unavailable, so I have
  collected up patches that have been posted to the linux-alpha mailing
  list over the last couple of months, and are forwarding them to you in
  the hope that you are prepared to accept them via me.

  The patches by Al Viro and myself I have been running against kernels
  for two months now so have had quite a bit of testing.  All except one
  patch were intended for the 3.5 kernel but because of Matt's
  unavailability never got forwarded to you."

* emailed patches from Michael Cree <mcree@orcon.net.nz>: (9 commits)
  alpha: Fix fall-out from disintegrating asm/system.h
  Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
  alpha: fix fpu.h usage in userspace
  alpha/mm/fault.c: Port OOM changes to do_page_fault
  alpha: take kernel_execve() out of entry.S
  alpha: take a bunch of syscalls into osf_sys.c
  alpha: Use new generic strncpy_from_user() and strnlen_user()
  alpha: Wire up cross memory attach syscalls
  alpha: Don't export SOCK_NONBLOCK to user space.
parents 6dab7ede d1b5153f

arch/alpha/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config ALPHA 
	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CMOS_UPDATE

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/alpha/include/asm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 */





#define ATOMIC_INIT(i)		( (atomic_t) { (i) } )

#define ATOMIC64_INIT(i)	( (atomic64_t) { (i) } )

#define ATOMIC_INIT(i)		{ (i) }

#define ATOMIC64_INIT(i)	{ (i) }



#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic64_read(v)	(*(volatile long *)&(v)->counter)

arch/alpha/include/asm/fpu.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ALPHA_FPU_H

#define __ASM_ALPHA_FPU_H



#ifdef __KERNEL__

#include <asm/special_insns.h>

#endif



/*

 * Alpha floating-point control register defines:

arch/alpha/include/asm/ptrace.h

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ struct switch_stack { 
#define task_pt_regs(task) \

  ((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1)



#define force_successful_syscall_return() (task_pt_regs(current)->r0 = 0)

#define current_pt_regs() \

  ((struct pt_regs *) ((char *)current_thread_info() + 2*PAGE_SIZE) - 1)



#define force_successful_syscall_return() (current_pt_regs()->r0 = 0)



#endif

arch/alpha/include/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -76,9 +76,11 @@ 
/* Instruct lower device to use last 4-bytes of skb data as FCS */

#define SO_NOFCS		43



#ifdef __KERNEL__

/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we

 * have to define SOCK_NONBLOCK to a different value here.

 */

#define SOCK_NONBLOCK	0x40000000

#endif /* __KERNEL__ */



#endif /* _ASM_SOCKET_H */