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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  add generic lib/checksum.c
  asm-generic: add a generic uaccess.h
  asm-generic: add generic NOMMU versions of some headers
  asm-generic: add generic atomic.h and io.h
  asm-generic: add legacy I/O header files
  asm-generic: add generic versions of common headers
  asm-generic: make bitops.h usable
  asm-generic: make pci.h usable directly
  asm-generic: make get_rtc_time overridable
  asm-generic: rename page.h and uaccess.h
  asm-generic: rename atomic.h to atomic-long.h
  asm-generic: add a generic unistd.h
  asm-generic: add generic ABI headers
  asm-generic: add generic sysv ipc headers
  asm-generic: introduce asm/bitsperlong.h
  asm-generic: rename termios.h, signal.h and mman.h
parents 6b702462 5b02ee3d

arch/alpha/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -256,5 +256,5 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) 
#define smp_mb__before_atomic_inc()	smp_mb()

#define smp_mb__after_atomic_inc()	smp_mb()



#include <asm-generic/atomic.h>

#include <asm-generic/atomic-long.h>

#endif /* _ALPHA_ATOMIC_H */

arch/alpha/include/asm/bitsperlong.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ALPHA_BITSPERLONG_H

#define __ASM_ALPHA_BITSPERLONG_H



#define __BITS_PER_LONG 64



#include <asm-generic/bitsperlong.h>



#endif /* __ASM_ALPHA_BITSPERLONG_H */

arch/alpha/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -93,6 +93,6 @@ typedef struct page *pgtable_t; 
					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#include <asm-generic/memory_model.h>

#include <asm-generic/page.h>

#include <asm-generic/getorder.h>



#endif /* _ALPHA_PAGE_H */

arch/alpha/include/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; 
#define SIG_UNBLOCK        2	/* for unblocking signals */

#define SIG_SETMASK        3	/* for setting the signal mask */



#include <asm-generic/signal.h>

#include <asm-generic/signal-defs.h>



#ifdef __KERNEL__

struct osf_sigaction {

arch/alpha/include/asm/types.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ typedef unsigned int umode_t; 
 * These aren't exported outside the kernel to avoid name space clashes

 */

#ifdef __KERNEL__



#define BITS_PER_LONG 64



#ifndef __ASSEMBLY__



typedef u64 dma_addr_t;