Commit cd166bd0 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -256,5 +256,5 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -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__before_atomic_inc() smp_mb()
#define smp_mb__after_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 */ #endif /* _ALPHA_ATOMIC_H */
#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 */
...@@ -93,6 +93,6 @@ typedef struct page *pgtable_t; ...@@ -93,6 +93,6 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ALPHA_PAGE_H */ #endif /* _ALPHA_PAGE_H */
...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; ...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
#define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */ #define SIG_SETMASK 3 /* for setting the signal mask */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct osf_sigaction { struct osf_sigaction {
......
...@@ -25,9 +25,6 @@ typedef unsigned int umode_t; ...@@ -25,9 +25,6 @@ typedef unsigned int umode_t;
* These aren't exported outside the kernel to avoid name space clashes * These aren't exported outside the kernel to avoid name space clashes
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 64
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
......
...@@ -249,6 +249,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -249,6 +249,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__before_atomic_inc() smp_mb() #define smp_mb__before_atomic_inc() smp_mb()
#define smp_mb__after_atomic_inc() smp_mb() #define smp_mb__after_atomic_inc() smp_mb()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif #endif
#endif #endif
#include <asm-generic/bitsperlong.h>
#ifndef __ARM_MMAN_H__ #ifndef __ARM_MMAN_H__
#define __ARM_MMAN_H__ #define __ARM_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -202,6 +202,6 @@ typedef struct page *pgtable_t; ...@@ -202,6 +202,6 @@ typedef struct page *pgtable_t;
(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif #endif
...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; ...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -196,6 +196,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v) ...@@ -196,6 +196,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ASM_AVR32_ATOMIC_H */ #endif /* __ASM_AVR32_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_AVR32_MMAN_H__ #ifndef __ASM_AVR32_MMAN_H__
#define __ASM_AVR32_MMAN_H__ #define __ASM_AVR32_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -112,7 +112,7 @@ typedef unsigned long sigset_t; ...@@ -112,7 +112,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -55,7 +55,7 @@ struct termio { ...@@ -55,7 +55,7 @@ struct termio {
*/ */
#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -208,6 +208,6 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) ...@@ -208,6 +208,6 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)
#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ARCH_BLACKFIN_ATOMIC __ */ #endif /* __ARCH_BLACKFIN_ATOMIC __ */
#include <asm-generic/bitsperlong.h>
...@@ -81,7 +81,7 @@ extern unsigned long memory_end; ...@@ -81,7 +81,7 @@ extern unsigned long memory_end;
#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
((void *)(kaddr) < (void *)memory_end)) ((void *)(kaddr) < (void *)memory_end))
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -104,7 +104,7 @@ typedef unsigned long sigset_t; ...@@ -104,7 +104,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -158,5 +158,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -158,5 +158,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif #endif
#include <asm-generic/bitsperlong.h>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* verbatim copy of asm-i386/ version */ /* verbatim copy of asm-i386/ version */
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -68,7 +68,7 @@ typedef struct page *pgtable_t; ...@@ -68,7 +68,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _CRIS_PAGE_H */ #endif /* _CRIS_PAGE_H */
...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; ...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -194,5 +194,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -194,5 +194,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_ATOMIC_H */ #endif /* _ASM_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_MMAN_H__ #ifndef __ASM_MMAN_H__
#define __ASM_MMAN_H__ #define __ASM_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -73,6 +73,6 @@ extern unsigned long max_pfn; ...@@ -73,6 +73,6 @@ extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_PAGE_H */ #endif /* _ASM_PAGE_H */
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#ifndef ASM_PCI_H #ifndef _ASM_FRV_PCI_H
#define ASM_PCI_H #define _ASM_FRV_PCI_H
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
...@@ -43,12 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, ...@@ -43,12 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
/* Return the index of the PCI controller for device PDEV. */ /* Return the index of the PCI controller for device PDEV. */
#define pci_controller_num(PDEV) (0) #define pci_controller_num(PDEV) (0)
/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
*/
#define PCI_DMA_BUS_IS_PHYS (1)
/* pci_unmap_{page,single} is a nop so... */ /* pci_unmap_{page,single} is a nop so... */
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
...@@ -111,5 +105,4 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev, ...@@ -111,5 +105,4 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev,
sg_dma_address(&sg[i])+sg_dma_len(&sg[i])); sg_dma_address(&sg[i])+sg_dma_len(&sg[i]));
} }
#endif /* _ASM_FRV_PCI_H */
#endif
...@@ -52,7 +52,7 @@ struct termio { ...@@ -52,7 +52,7 @@ struct termio {
/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif #endif
#endif /* _ASM_TERMIOS_H */ #endif /* _ASM_TERMIOS_H */
...@@ -141,5 +141,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v) ...@@ -141,5 +141,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ARCH_H8300_ATOMIC __ */ #endif /* __ARCH_H8300_ATOMIC __ */
#include <asm-generic/bitsperlong.h>
#ifndef __H8300_MMAN_H__ #ifndef __H8300_MMAN_H__
#define __H8300_MMAN_H__ #define __H8300_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -73,6 +73,6 @@ extern unsigned long memory_end; ...@@ -73,6 +73,6 @@ extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _H8300_PAGE_H */ #endif /* _H8300_PAGE_H */
...@@ -105,7 +105,7 @@ typedef unsigned long sigset_t; ...@@ -105,7 +105,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -216,5 +216,5 @@ atomic64_add_negative (__s64 i, atomic64_t *v) ...@@ -216,5 +216,5 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_IA64_ATOMIC_H */ #endif /* _ASM_IA64_ATOMIC_H */
#ifndef __ASM_IA64_BITSPERLONG_H
#define __ASM_IA64_BITSPERLONG_H
#define __BITS_PER_LONG 64
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_IA64_BITSPERLONG_H */
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
*/ */
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x00100 /* stack-like segment */ #define MAP_GROWSDOWN 0x00100 /* stack-like segment */
#define MAP_GROWSUP 0x00200 /* register stack-like segment */ #define MAP_GROWSUP 0x00200 /* register stack-like segment */
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
# ifndef __ASSEMBLY__ # ifndef __ASSEMBLY__
......
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
# define __IA64_UL(x) (x) # define __IA64_UL(x) (x)
# define __IA64_UL_CONST(x) x # define __IA64_UL_CONST(x) x
# ifdef __KERNEL__
# define BITS_PER_LONG 64
# endif
#else #else
# define __IA64_UL(x) ((unsigned long)(x)) # define __IA64_UL(x) ((unsigned long)(x))
# define __IA64_UL_CONST(x) x##UL # define __IA64_UL_CONST(x) x##UL
...@@ -34,10 +30,7 @@ typedef unsigned int umode_t; ...@@ -34,10 +30,7 @@ typedef unsigned int umode_t;
*/ */
# ifdef __KERNEL__ # ifdef __KERNEL__
#define BITS_PER_LONG 64
/* DMA addresses are 64-bits wide, in general. */ /* DMA addresses are 64-bits wide, in general. */
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
# endif /* __KERNEL__ */ # endif /* __KERNEL__ */
......
...@@ -314,5 +314,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, atomic_t *addr) ...@@ -314,5 +314,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, atomic_t *addr)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_M32R_ATOMIC_H */ #endif /* _ASM_M32R_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
#ifndef __M32R_MMAN_H__ #ifndef __M32R_MMAN_H__
#define __M32R_MMAN_H__ #define __M32R_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -82,6 +82,6 @@ typedef struct page *pgtable_t; ...@@ -82,6 +82,6 @@ typedef struct page *pgtable_t;
#define devmem_is_allowed(x) 1 #define devmem_is_allowed(x) 1
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_M32R_PAGE_H */ #endif /* _ASM_M32R_PAGE_H */
...@@ -3,6 +3,4 @@ ...@@ -3,6 +3,4 @@
#include <asm-generic/pci.h> #include <asm-generic/pci.h>
#define PCI_DMA_BUS_IS_PHYS (1)
#endif /* _ASM_M32R_PCI_H */ #endif /* _ASM_M32R_PCI_H */
...@@ -107,7 +107,7 @@ typedef unsigned long sigset_t; ...@@ -107,7 +107,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -192,5 +192,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -192,5 +192,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ARCH_M68K_ATOMIC __ */ #endif /* __ARCH_M68K_ATOMIC __ */
...@@ -151,5 +151,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -151,5 +151,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
#define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_dec_return(v) atomic_sub_return(1,(v))
#define atomic_inc_return(v) atomic_add_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1,(v))
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ARCH_M68KNOMMU_ATOMIC __ */ #endif /* __ARCH_M68KNOMMU_ATOMIC __ */
#include <asm-generic/bitsperlong.h>
#ifndef __M68K_MMAN_H__ #ifndef __M68K_MMAN_H__
#define __M68K_MMAN_H__ #define __M68K_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -223,6 +223,6 @@ static inline __attribute_const__ int __virt_to_node_shift(void) ...@@ -223,6 +223,6 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _M68K_PAGE_H */ #endif /* _M68K_PAGE_H */
...@@ -72,6 +72,6 @@ extern unsigned long memory_end; ...@@ -72,6 +72,6 @@ extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _M68KNOMMU_PAGE_H */ #endif /* _M68KNOMMU_PAGE_H */
...@@ -103,7 +103,7 @@ typedef unsigned long sigset_t; ...@@ -103,7 +103,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -118,6 +118,6 @@ static inline int atomic_dec_if_positive(atomic_t *v) ...@@ -118,6 +118,6 @@ static inline int atomic_dec_if_positive(atomic_t *v)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_MICROBLAZE_ATOMIC_H */ #endif /* _ASM_MICROBLAZE_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
...@@ -215,6 +215,6 @@ extern int page_is_ram(unsigned long pfn); ...@@ -215,6 +215,6 @@ extern int page_is_ram(unsigned long pfn);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_MICROBLAZE_PAGE_H */ #endif /* _ASM_MICROBLAZE_PAGE_H */
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
# ifndef __ASSEMBLY__ # ifndef __ASSEMBLY__
# include <linux/types.h> # include <linux/types.h>
# include <asm-generic/signal.h> # include <asm-generic/signal-defs.h>
/* Avoid too many header ordering problems. */ /* Avoid too many header ordering problems. */
struct siginfo; struct siginfo;
......
...@@ -81,7 +81,7 @@ struct termio { ...@@ -81,7 +81,7 @@ struct termio {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -793,6 +793,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -793,6 +793,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#define smp_mb__before_atomic_inc() smp_llsc_mb() #define smp_mb__before_atomic_inc() smp_llsc_mb()
#define smp_mb__after_atomic_inc() smp_llsc_mb() #define smp_mb__after_atomic_inc() smp_llsc_mb()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_ATOMIC_H */ #endif /* _ASM_ATOMIC_H */
#ifndef __ASM_MIPS_BITSPERLONG_H
#define __ASM_MIPS_BITSPERLONG_H
#define __BITS_PER_LONG _MIPS_SZLONG
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_MIPS_BITSPERLONG_H */
...@@ -189,6 +189,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; ...@@ -189,6 +189,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) #define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_PAGE_H */ #endif /* _ASM_PAGE_H */
...@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ ...@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */
#define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */ #define SIG_SETMASK 3 /* for setting the signal mask */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct sigaction { struct sigaction {
unsigned int sa_flags; unsigned int sa_flags;
......
...@@ -31,9 +31,6 @@ typedef unsigned short umode_t; ...@@ -31,9 +31,6 @@ typedef unsigned short umode_t;
* These aren't exported outside the kernel to avoid name space clashes * These aren't exported outside the kernel to avoid name space clashes
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG _MIPS_SZLONG
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
......
...@@ -151,7 +151,7 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) ...@@ -151,7 +151,7 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_ATOMIC_H */ #endif /* _ASM_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef _ASM_MMAN_H #ifndef _ASM_MMAN_H
#define _ASM_MMAN_H #define _ASM_MMAN_H
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t; ...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -338,6 +338,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -338,6 +338,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#endif /* CONFIG_64BIT */ #endif /* CONFIG_64BIT */
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_PARISC_ATOMIC_H_ */ #endif /* _ASM_PARISC_ATOMIC_H_ */
#ifndef __ASM_PARISC_BITSPERLONG_H
#define __ASM_PARISC_BITSPERLONG_H
/*
* using CONFIG_* outside of __KERNEL__ is wrong,
* __LP64__ was also removed from headers, so what
* is the right approach on parisc?
* -arnd
*/
#if (defined(__KERNEL__) && defined(CONFIG_64BIT)) || defined (__LP64__)
#define __BITS_PER_LONG 64
#define SHIFT_PER_LONG 6
#else
#define __BITS_PER_LONG 32
#define SHIFT_PER_LONG 5
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_PARISC_BITSPERLONG_H */
...@@ -159,6 +159,6 @@ extern int npmem_ranges; ...@@ -159,6 +159,6 @@ extern int npmem_ranges;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _PARISC_PAGE_H */ #endif /* _PARISC_PAGE_H */
...@@ -14,14 +14,6 @@ typedef unsigned short umode_t; ...@@ -14,14 +14,6 @@ typedef unsigned short umode_t;
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_64BIT
#define BITS_PER_LONG 64
#define SHIFT_PER_LONG 6
#else
#define BITS_PER_LONG 32
#define SHIFT_PER_LONG 5
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Dma addresses are 32-bits wide. */ /* Dma addresses are 32-bits wide. */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm-generic/uaccess.h> #include <asm-generic/uaccess-unaligned.h>
#define VERIFY_READ 0 #define VERIFY_READ 0
#define VERIFY_WRITE 1 #define VERIFY_WRITE 1
......
...@@ -472,6 +472,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -472,6 +472,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_ATOMIC_H_ */ #endif /* _ASM_POWERPC_ATOMIC_H_ */
#ifndef __ASM_POWERPC_BITSPERLONG_H
#define __ASM_POWERPC_BITSPERLONG_H
#if defined(__powerpc64__)
# define __BITS_PER_LONG 64
#else
# define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_POWERPC_BITSPERLONG_H */
#ifndef _ASM_POWERPC_MMAN_H #ifndef _ASM_POWERPC_MMAN_H
#define _ASM_POWERPC_MMAN_H #define _ASM_POWERPC_MMAN_H
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
/* /*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
......
...@@ -41,7 +41,7 @@ extern void clear_pages(void *page, int order); ...@@ -41,7 +41,7 @@ extern void clear_pages(void *page, int order);
static inline void clear_page(void *page) { clear_pages(page, 0); } static inline void clear_page(void *page) { clear_pages(page, 0); }
extern void copy_page(void *to, void *from); extern void copy_page(void *to, void *from);
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1) #define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1) #define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
......
...@@ -180,6 +180,6 @@ do { \ ...@@ -180,6 +180,6 @@ do { \
(test_thread_flag(TIF_32BIT) ? \ (test_thread_flag(TIF_32BIT) ? \
VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_POWERPC_PAGE_64_H */ #endif /* _ASM_POWERPC_PAGE_64_H */
...@@ -94,7 +94,7 @@ typedef struct { ...@@ -94,7 +94,7 @@ typedef struct {
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct old_sigaction { struct old_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
......
...@@ -78,7 +78,7 @@ struct termio { ...@@ -78,7 +78,7 @@ struct termio {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -40,15 +40,6 @@ typedef struct { ...@@ -40,15 +40,6 @@ typedef struct {
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef __KERNEL__ #ifdef __KERNEL__
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
#ifdef __powerpc64__
#define BITS_PER_LONG 64
#else
#define BITS_PER_LONG 32
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef __vector128 vector128; typedef __vector128 vector128;
......
...@@ -275,6 +275,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, ...@@ -275,6 +275,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v,
#define smp_mb__before_atomic_inc() smp_mb() #define smp_mb__before_atomic_inc() smp_mb()
#define smp_mb__after_atomic_inc() smp_mb() #define smp_mb__after_atomic_inc() smp_mb()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ARCH_S390_ATOMIC__ */ #endif /* __ARCH_S390_ATOMIC__ */
#ifndef __ASM_S390_BITSPERLONG_H
#define __ASM_S390_BITSPERLONG_H
#ifndef __s390x__
#define __BITS_PER_LONG 32
#else
#define __BITS_PER_LONG 64
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_S390_BITSPERLONG_H */
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __S390_MMAN_H__ #ifndef __S390_MMAN_H__
#define __S390_MMAN_H__ #define __S390_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -150,7 +150,7 @@ void arch_alloc_page(struct page *page, int order); ...@@ -150,7 +150,7 @@ void arch_alloc_page(struct page *page, int order);
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#define __HAVE_ARCH_GATE_AREA 1 #define __HAVE_ARCH_GATE_AREA 1
......
...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t; ...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -60,7 +60,7 @@ struct termio { ...@@ -60,7 +60,7 @@ struct termio {
#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -28,12 +28,6 @@ typedef __signed__ long saddr_t; ...@@ -28,12 +28,6 @@ typedef __signed__ long saddr_t;
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __s390x__
#define BITS_PER_LONG 32
#else
#define BITS_PER_LONG 64
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
......
...@@ -84,5 +84,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -84,5 +84,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* __ASM_SH_ATOMIC_H */ #endif /* __ASM_SH_ATOMIC_H */
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_SH_MMAN_H #ifndef __ASM_SH_MMAN_H
#define __ASM_SH_MMAN_H #define __ASM_SH_MMAN_H
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -163,7 +163,7 @@ typedef struct page *pgtable_t; ...@@ -163,7 +163,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
/* vDSO support */ /* vDSO support */
#ifdef CONFIG_VSYSCALL #ifdef CONFIG_VSYSCALL
......
...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; ...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -161,5 +161,5 @@ static inline int __atomic24_sub(int i, atomic24_t *v) ...@@ -161,5 +161,5 @@ static inline int __atomic24_sub(int i, atomic24_t *v)
#endif /* !(__KERNEL__) */ #endif /* !(__KERNEL__) */
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* !(__ARCH_SPARC_ATOMIC__) */ #endif /* !(__ARCH_SPARC_ATOMIC__) */
...@@ -114,5 +114,5 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -114,5 +114,5 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
#define smp_mb__before_atomic_inc() barrier() #define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic.h> #include <asm-generic/atomic-long.h>
#endif /* !(__ARCH_SPARC64_ATOMIC__) */ #endif /* !(__ARCH_SPARC64_ATOMIC__) */
#ifndef __ASM_ALPHA_BITSPERLONG_H
#define __ASM_ALPHA_BITSPERLONG_H
#if defined(__sparc__) && defined(__arch64__)
#define __BITS_PER_LONG 64
#else
#define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_ALPHA_BITSPERLONG_H */
#ifndef __SPARC_MMAN_H__ #ifndef __SPARC_MMAN_H__
#define __SPARC_MMAN_H__ #define __SPARC_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
/* SunOS'ified... */ /* SunOS'ified... */
......
...@@ -152,6 +152,6 @@ extern unsigned long pfn_base; ...@@ -152,6 +152,6 @@ extern unsigned long pfn_base;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _SPARC_PAGE_H */ #endif /* _SPARC_PAGE_H */
...@@ -132,6 +132,6 @@ typedef struct page *pgtable_t; ...@@ -132,6 +132,6 @@ typedef struct page *pgtable_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _SPARC64_PAGE_H */ #endif /* _SPARC64_PAGE_H */
...@@ -176,7 +176,7 @@ struct sigstack { ...@@ -176,7 +176,7 @@ struct sigstack {
#define SA_STATIC_ALLOC 0x8000 #define SA_STATIC_ALLOC 0x8000
#endif #endif
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct __new_sigaction { struct __new_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
......
...@@ -21,8 +21,6 @@ typedef unsigned short umode_t; ...@@ -21,8 +21,6 @@ typedef unsigned short umode_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 64
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Dma addresses come in generic and 64-bit flavours. */ /* Dma addresses come in generic and 64-bit flavours. */
...@@ -46,8 +44,6 @@ typedef unsigned short umode_t; ...@@ -46,8 +44,6 @@ typedef unsigned short umode_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 32
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment