diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/atomic_mm.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/atomic_no.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/bitsperlong.h | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/mman.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_mm.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/page_no.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/signal.h | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic_mm.h index eb0ab9d4ee77..88b7af20a996 100644 --- a/arch/m68k/include/asm/atomic_mm.h +++ b/arch/m68k/include/asm/atomic_mm.h | |||
@@ -192,5 +192,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
192 | #define smp_mb__before_atomic_inc() barrier() | 192 | #define smp_mb__before_atomic_inc() barrier() |
193 | #define smp_mb__after_atomic_inc() barrier() | 193 | #define smp_mb__after_atomic_inc() barrier() |
194 | 194 | ||
195 | #include <asm-generic/atomic.h> | 195 | #include <asm-generic/atomic-long.h> |
196 | #endif /* __ARCH_M68K_ATOMIC __ */ | 196 | #endif /* __ARCH_M68K_ATOMIC __ */ |
diff --git a/arch/m68k/include/asm/atomic_no.h b/arch/m68k/include/asm/atomic_no.h index 6bb674855a3f..5674cb9449bd 100644 --- a/arch/m68k/include/asm/atomic_no.h +++ b/arch/m68k/include/asm/atomic_no.h | |||
@@ -151,5 +151,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
151 | #define atomic_dec_return(v) atomic_sub_return(1,(v)) | 151 | #define atomic_dec_return(v) atomic_sub_return(1,(v)) |
152 | #define atomic_inc_return(v) atomic_add_return(1,(v)) | 152 | #define atomic_inc_return(v) atomic_add_return(1,(v)) |
153 | 153 | ||
154 | #include <asm-generic/atomic.h> | 154 | #include <asm-generic/atomic-long.h> |
155 | #endif /* __ARCH_M68KNOMMU_ATOMIC __ */ | 155 | #endif /* __ARCH_M68KNOMMU_ATOMIC __ */ |
diff --git a/arch/m68k/include/asm/bitsperlong.h b/arch/m68k/include/asm/bitsperlong.h new file mode 100644 index 000000000000..6dc0bb0c13b2 --- /dev/null +++ b/arch/m68k/include/asm/bitsperlong.h | |||
@@ -0,0 +1 @@ | |||
#include <asm-generic/bitsperlong.h> | |||
diff --git a/arch/m68k/include/asm/mman.h b/arch/m68k/include/asm/mman.h index 1626d37f4898..9f5c4c4b3c7b 100644 --- a/arch/m68k/include/asm/mman.h +++ b/arch/m68k/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __M68K_MMAN_H__ | 1 | #ifndef __M68K_MMAN_H__ |
2 | #define __M68K_MMAN_H__ | 2 | #define __M68K_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index a34b8bad7847..d009f3ea39ab 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h | |||
@@ -223,6 +223,6 @@ static inline __attribute_const__ int __virt_to_node_shift(void) | |||
223 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 223 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
224 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 224 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
225 | 225 | ||
226 | #include <asm-generic/page.h> | 226 | #include <asm-generic/getorder.h> |
227 | 227 | ||
228 | #endif /* _M68K_PAGE_H */ | 228 | #endif /* _M68K_PAGE_H */ |
diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h index 3a1ede4544cb..9aa3f90f4855 100644 --- a/arch/m68k/include/asm/page_no.h +++ b/arch/m68k/include/asm/page_no.h | |||
@@ -72,6 +72,6 @@ extern unsigned long memory_end; | |||
72 | 72 | ||
73 | #endif /* __ASSEMBLY__ */ | 73 | #endif /* __ASSEMBLY__ */ |
74 | 74 | ||
75 | #include <asm-generic/page.h> | 75 | #include <asm-generic/getorder.h> |
76 | 76 | ||
77 | #endif /* _M68KNOMMU_PAGE_H */ | 77 | #endif /* _M68KNOMMU_PAGE_H */ |
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h index 08788fdefde0..5bc09c787a11 100644 --- a/arch/m68k/include/asm/signal.h +++ b/arch/m68k/include/asm/signal.h | |||
@@ -103,7 +103,7 @@ typedef unsigned long sigset_t; | |||
103 | #define MINSIGSTKSZ 2048 | 103 | #define MINSIGSTKSZ 2048 |
104 | #define SIGSTKSZ 8192 | 104 | #define SIGSTKSZ 8192 |
105 | 105 | ||
106 | #include <asm-generic/signal.h> | 106 | #include <asm-generic/signal-defs.h> |
107 | 107 | ||
108 | #ifdef __KERNEL__ | 108 | #ifdef __KERNEL__ |
109 | struct old_sigaction { | 109 | struct old_sigaction { |