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

cd166bd0 · Linus Torvalds <[email protected]> · 2009-06-12 18:15:51 -07:00

* '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

Commit: cd166bd0dde265a97dd9aa8e3451a2646d96d04b
Parents: 6b702462 · 5b02ee3d

Merge commit. Changes below are compared with the first parent: 6b702462.

Changes

187 files changed · +4717 −459

File	Status	Add	Del	Content
arch/alpha/include/asm/atomic.h	modified	+1	−1	View file
arch/alpha/include/asm/bitsperlong.h	added	+8	−0	View file
arch/alpha/include/asm/page.h	modified	+1	−1	View file
arch/alpha/include/asm/signal.h	modified	+1	−1	View file
arch/alpha/include/asm/types.h	modified	+0	−3	View file
arch/arm/include/asm/atomic.h	modified	+1	−1	View file
arch/arm/include/asm/bitsperlong.h	added	+1	−0	View file
arch/arm/include/asm/mman.h	modified	+1	−1	View file
arch/arm/include/asm/page.h	modified	+1	−1	View file
arch/arm/include/asm/signal.h	modified	+1	−1	View file
arch/avr32/include/asm/atomic.h	modified	+1	−1	View file
arch/avr32/include/asm/bitsperlong.h	added	+1	−0	View file
arch/avr32/include/asm/mman.h	modified	+1	−1	View file
arch/avr32/include/asm/signal.h	modified	+1	−1	View file
arch/avr32/include/asm/termios.h	modified	+1	−1	View file
arch/blackfin/include/asm/atomic.h	modified	+1	−1	View file
arch/blackfin/include/asm/bitsperlong.h	added	+1	−0	View file
arch/blackfin/include/asm/page.h	modified	+1	−1	View file
arch/blackfin/include/asm/signal.h	modified	+1	−1	View file
arch/cris/include/asm/atomic.h	modified	+1	−1	View file
arch/cris/include/asm/bitsperlong.h	added	+1	−0	View file
arch/cris/include/asm/mman.h	modified	+1	−1	View file
arch/cris/include/asm/page.h	modified	+1	−1	View file
arch/cris/include/asm/signal.h	modified	+1	−1	View file
arch/frv/include/asm/atomic.h	modified	+1	−1	View file
arch/frv/include/asm/bitsperlong.h	added	+1	−0	View file
arch/frv/include/asm/mman.h	modified	+1	−1	View file
arch/frv/include/asm/page.h	modified	+1	−1	View file
arch/frv/include/asm/pci.h	modified	+3	−10	View file
arch/frv/include/asm/termios.h	modified	+1	−1	View file
arch/h8300/include/asm/atomic.h	modified	+1	−1	View file
arch/h8300/include/asm/bitsperlong.h	added	+1	−0	View file
arch/h8300/include/asm/mman.h	modified	+1	−1	View file
arch/h8300/include/asm/page.h	modified	+1	−1	View file
arch/h8300/include/asm/signal.h	modified	+1	−1	View file
arch/ia64/include/asm/atomic.h	modified	+1	−1	View file
arch/ia64/include/asm/bitsperlong.h	added	+8	−0	View file
arch/ia64/include/asm/mman.h	modified	+1	−1	View file
arch/ia64/include/asm/signal.h	modified	+1	−1	View file
arch/ia64/include/asm/types.h	modified	+0	−7	View file
arch/m32r/include/asm/atomic.h	modified	+1	−1	View file
arch/m32r/include/asm/bitsperlong.h	added	+1	−0	View file
arch/m32r/include/asm/mman.h	modified	+1	−1	View file
arch/m32r/include/asm/page.h	modified	+1	−1	View file
arch/m32r/include/asm/pci.h	modified	+0	−2	View file
arch/m32r/include/asm/signal.h	modified	+1	−1	View file
arch/m68k/include/asm/atomic_mm.h	modified	+1	−1	View file
arch/m68k/include/asm/atomic_no.h	modified	+1	−1	View file
arch/m68k/include/asm/bitsperlong.h	added	+1	−0	View file
arch/m68k/include/asm/mman.h	modified	+1	−1	View file
arch/m68k/include/asm/page_mm.h	modified	+1	−1	View file
arch/m68k/include/asm/page_no.h	modified	+1	−1	View file
arch/m68k/include/asm/signal.h	modified	+1	−1	View file
arch/microblaze/include/asm/atomic.h	modified	+1	−1	View file
arch/microblaze/include/asm/bitsperlong.h	added	+1	−0	View file
arch/microblaze/include/asm/page.h	modified	+1	−1	View file
arch/microblaze/include/asm/signal.h	modified	+1	−1	View file
arch/microblaze/include/asm/termios.h	modified	+1	−1	View file
arch/mips/include/asm/atomic.h	modified	+1	−1	View file
arch/mips/include/asm/bitsperlong.h	added	+8	−0	View file
arch/mips/include/asm/page.h	modified	+1	−1	View file
arch/mips/include/asm/signal.h	modified	+1	−1	View file
arch/mips/include/asm/types.h	modified	+0	−3	View file
arch/mn10300/include/asm/atomic.h	modified	+1	−1	View file
arch/mn10300/include/asm/bitsperlong.h	added	+1	−0	View file
arch/mn10300/include/asm/mman.h	modified	+1	−1	View file
arch/mn10300/include/asm/signal.h	modified	+1	−1	View file
arch/parisc/include/asm/atomic.h	modified	+1	−1	View file
arch/parisc/include/asm/bitsperlong.h	added	+20	−0	View file
arch/parisc/include/asm/page.h	modified	+1	−1	View file
arch/parisc/include/asm/types.h	modified	+0	−8	View file
arch/parisc/include/asm/uaccess.h	modified	+1	−1	View file
arch/powerpc/include/asm/atomic.h	modified	+1	−1	View file
arch/powerpc/include/asm/bitsperlong.h	added	+12	−0	View file
arch/powerpc/include/asm/mman.h	modified	+1	−1	View file
arch/powerpc/include/asm/page_32.h	modified	+1	−1	View file
arch/powerpc/include/asm/page_64.h	modified	+1	−1	View file
arch/powerpc/include/asm/signal.h	modified	+1	−1	View file
arch/powerpc/include/asm/termios.h	modified	+1	−1	View file
arch/powerpc/include/asm/types.h	modified	+0	−9	View file
arch/s390/include/asm/atomic.h	modified	+1	−1	View file
arch/s390/include/asm/bitsperlong.h	added	+13	−0	View file
arch/s390/include/asm/mman.h	modified	+1	−1	View file
arch/s390/include/asm/page.h	modified	+1	−1	View file
arch/s390/include/asm/signal.h	modified	+1	−1	View file
arch/s390/include/asm/termios.h	modified	+1	−1	View file
arch/s390/include/asm/types.h	modified	+0	−6	View file
arch/sh/include/asm/atomic.h	modified	+1	−1	View file
arch/sh/include/asm/bitsperlong.h	added	+1	−0	View file
arch/sh/include/asm/mman.h	modified	+1	−1	View file
arch/sh/include/asm/page.h	modified	+1	−1	View file
arch/sh/include/asm/signal.h	modified	+1	−1	View file
arch/sparc/include/asm/atomic_32.h	modified	+1	−1	View file
arch/sparc/include/asm/atomic_64.h	modified	+1	−1	View file
arch/sparc/include/asm/bitsperlong.h	added	+13	−0	View file
arch/sparc/include/asm/mman.h	modified	+1	−1	View file
arch/sparc/include/asm/page_32.h	modified	+1	−1	View file
arch/sparc/include/asm/page_64.h	modified	+1	−1	View file
arch/sparc/include/asm/signal.h	modified	+1	−1	View file
arch/sparc/include/asm/types.h	modified	+0	−4	View file
arch/sparc/include/asm/uaccess_64.h	modified	+1	−1	View file
arch/um/include/asm/page.h	modified	+1	−1	View file
arch/x86/include/asm/atomic_32.h	modified	+1	−1	View file
arch/x86/include/asm/atomic_64.h	modified	+1	−1	View file
arch/x86/include/asm/bitsperlong.h	added	+13	−0	View file
arch/x86/include/asm/mman.h	modified	+1	−1	View file
arch/x86/include/asm/page.h	modified	+1	−1	View file
arch/x86/include/asm/signal.h	modified	+1	−1	View file
arch/x86/include/asm/types.h	modified	+0	−6	View file
arch/xtensa/include/asm/atomic.h	modified	+1	−1	View file
arch/xtensa/include/asm/bitsperlong.h	added	+1	−0	View file
arch/xtensa/include/asm/page.h	modified	+1	−1	View file
include/asm-generic/Kbuild	modified	+22	−0	View file
include/asm-generic/Kbuild.asm	modified	+1	−0	View file
include/asm-generic/atomic-long.h	added	+258	−0	View file
include/asm-generic/atomic.h	modified	+114	−207	View file
include/asm-generic/auxvec.h	added	+8	−0	View file
include/asm-generic/bitops.h	modified	+18	−6	View file
include/asm-generic/bitops/atomic.h	modified	+1	−0	View file
include/asm-generic/bitsperlong.h	added	+32	−0	View file
include/asm-generic/bugs.h	added	+10	−0	View file
include/asm-generic/cache.h	added	+12	−0	View file
include/asm-generic/cacheflush.h	added	+30	−0	View file
include/asm-generic/checksum.h	added	+79	−0	View file
include/asm-generic/current.h	added	+9	−0	View file
include/asm-generic/delay.h	added	+9	−0	View file
include/asm-generic/dma.h	added	+15	−0	View file
include/asm-generic/fb.h	added	+12	−0	View file
include/asm-generic/getorder.h	added	+24	−0	View file
include/asm-generic/hardirq.h	added	+34	−0	View file
include/asm-generic/hw_irq.h	added	+9	−0	View file
include/asm-generic/int-l64.h	modified	+2	−0	View file
include/asm-generic/int-ll64.h	modified	+2	−0	View file
include/asm-generic/io.h	added	+300	−0	View file
include/asm-generic/ioctls.h	added	+110	−0	View file
include/asm-generic/ipcbuf.h	added	+34	−0	View file
include/asm-generic/irq.h	added	+18	−0	View file
include/asm-generic/irqflags.h	added	+72	−0	View file
include/asm-generic/kmap_types.h	added	+32	−0	View file
include/asm-generic/linkage.h	added	+8	−0	View file
include/asm-generic/mman-common.h	added	+41	−0	View file
include/asm-generic/mman.h	modified	+14	−37	View file
include/asm-generic/mmu.h	added	+15	−0	View file
include/asm-generic/mmu_context.h	added	+45	−0	View file
include/asm-generic/module.h	added	+22	−0	View file
include/asm-generic/msgbuf.h	added	+47	−0	View file
include/asm-generic/mutex.h	added	+9	−0	View file
include/asm-generic/page.h	modified	+92	−17	View file
include/asm-generic/param.h	added	+24	−0	View file
include/asm-generic/parport.h	added	+23	−0	View file
include/asm-generic/pci.h	modified	+8	−0	View file
include/asm-generic/pgalloc.h	added	+12	−0	View file
include/asm-generic/posix_types.h	added	+165	−0	View file
include/asm-generic/rtc.h	modified	+1	−1	View file
include/asm-generic/scatterlist.h	added	+43	−0	View file
include/asm-generic/segment.h	added	+9	−0	View file
include/asm-generic/sembuf.h	added	+38	−0	View file
include/asm-generic/serial.h	added	+13	−0	View file
include/asm-generic/setup.h	added	+6	−0	View file
include/asm-generic/shmbuf.h	added	+59	−0	View file
include/asm-generic/shmparam.h	added	+6	−0	View file
include/asm-generic/signal-defs.h	added	+28	−0	View file
include/asm-generic/signal.h	modified	+120	−17	View file
include/asm-generic/socket.h	added	+63	−0	View file
include/asm-generic/sockios.h	added	+13	−0	View file
include/asm-generic/spinlock.h	added	+11	−0	View file
include/asm-generic/stat.h	added	+72	−0	View file
include/asm-generic/string.h	added	+10	−0	View file
include/asm-generic/swab.h	added	+18	−0	View file
include/asm-generic/syscalls.h	added	+60	−0	View file
include/asm-generic/system.h	added	+161	−0	View file
include/asm-generic/termbits.h	added	+198	−0	View file
include/asm-generic/termios-base.h	added	+77	−0	View file
include/asm-generic/termios.h	modified	+91	−14	View file
include/asm-generic/timex.h	added	+22	−0	View file
include/asm-generic/tlbflush.h	added	+18	−0	View file
include/asm-generic/types.h	added	+42	−0	View file
include/asm-generic/uaccess-unaligned.h	added	+26	−0	View file
include/asm-generic/uaccess.h	modified	+316	−17	View file
include/asm-generic/ucontext.h	added	+12	−0	View file
include/asm-generic/unaligned.h	added	+30	−0	View file
include/asm-generic/unistd.h	added	+854	−0	View file
include/asm-generic/user.h	added	+8	−0	View file
include/asm-generic/vga.h	added	+24	−0	View file
lib/Makefile	modified	+2	−0	View file
lib/checksum.c	added	+193	−0	View file
scripts/checksyscalls.sh	modified	+89	−3	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/alpha/include/asm/atomic.h

View file

diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
index 62b3635..610dff4 100644
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
@@ -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

View file

diff --git a/arch/alpha/include/asm/bitsperlong.h b/arch/alpha/include/asm/bitsperlong.h
new file mode 100644
index 0000000..ad57f78
--- /dev/null
+++ b/arch/alpha/include/asm/bitsperlong.h
@@ -0,0 +1,8 @@
+#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

View file

diff --git a/arch/alpha/include/asm/page.h b/arch/alpha/include/asm/page.h
index 0995f9d..07af062 100644
--- a/arch/alpha/include/asm/page.h
+++ b/arch/alpha/include/asm/page.h
@@ -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

View file

diff --git a/arch/alpha/include/asm/signal.h b/arch/alpha/include/asm/signal.h
index 13c2305..a938830 100644
--- a/arch/alpha/include/asm/signal.h
+++ b/arch/alpha/include/asm/signal.h
@@ -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

View file

diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
index f072f34..bd621ec 100644
--- a/arch/alpha/include/asm/types.h
+++ b/arch/alpha/include/asm/types.h
@@ -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;

arch/arm/include/asm/atomic.h

View file

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 16b52f3..9e07fe5 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -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__after_atomic_inc()	smp_mb()
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif
 #endif

arch/arm/include/asm/bitsperlong.h

View file

diff --git a/arch/arm/include/asm/bitsperlong.h b/arch/arm/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/arm/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/arm/include/asm/mman.h

View file

diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/asm/mman.h
index 54570d2..fc26976 100644
--- a/arch/arm/include/asm/mman.h
+++ b/arch/arm/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __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_DENYWRITE	0x0800		/* ETXTBSY */

arch/arm/include/asm/page.h

View file

diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
index 7b52277..be962c1 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -202,6 +202,6 @@ typedef struct page *pgtable_t;
 	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
 	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
 
 #endif

arch/arm/include/asm/signal.h

View file

diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index d0fb487..43ba0fb 100644
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/avr32/include/asm/atomic.h

View file

diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h
index 3188151..b131c27 100644
--- a/arch/avr32/include/asm/atomic.h
+++ b/arch/avr32/include/asm/atomic.h
@@ -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__after_atomic_inc()	barrier()
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 
 #endif /*  __ASM_AVR32_ATOMIC_H */

arch/avr32/include/asm/bitsperlong.h

View file

diff --git a/arch/avr32/include/asm/bitsperlong.h b/arch/avr32/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/avr32/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/avr32/include/asm/mman.h

View file

diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/asm/mman.h
index 648f91e..9a92b15 100644
--- a/arch/avr32/include/asm/mman.h
+++ b/arch/avr32/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __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_DENYWRITE	0x0800		/* ETXTBSY */

arch/avr32/include/asm/signal.h

View file

diff --git a/arch/avr32/include/asm/signal.h b/arch/avr32/include/asm/signal.h
index caffefe..8790dfc 100644
--- a/arch/avr32/include/asm/signal.h
+++ b/arch/avr32/include/asm/signal.h
@@ -112,7 +112,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/avr32/include/asm/termios.h

View file

diff --git a/arch/avr32/include/asm/termios.h b/arch/avr32/include/asm/termios.h
index 0152aba..dd7e9da 100644
--- a/arch/avr32/include/asm/termios.h
+++ b/arch/avr32/include/asm/termios.h
@@ -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"
 
-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>
 
 #endif	/* __KERNEL__ */
 

arch/blackfin/include/asm/atomic.h

View file

diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
index 94b2a9b..7bbf44e 100644
--- a/arch/blackfin/include/asm/atomic.h
+++ b/arch/blackfin/include/asm/atomic.h
@@ -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_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 __ */

arch/blackfin/include/asm/bitsperlong.h

View file

diff --git a/arch/blackfin/include/asm/bitsperlong.h b/arch/blackfin/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/blackfin/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/blackfin/include/asm/page.h

View file

diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h
index 344f6a8..3ea2016 100644
--- a/arch/blackfin/include/asm/page.h
+++ b/arch/blackfin/include/asm/page.h
@@ -81,7 +81,7 @@ extern unsigned long memory_end;
 #define	virt_addr_valid(kaddr)	(((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
 				((void *)(kaddr) < (void *)memory_end))
 
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
 
 #endif				/* __ASSEMBLY__ */
 

arch/blackfin/include/asm/signal.h

View file

diff --git a/arch/blackfin/include/asm/signal.h b/arch/blackfin/include/asm/signal.h
index 87951d2..2eea907 100644
--- a/arch/blackfin/include/asm/signal.h
+++ b/arch/blackfin/include/asm/signal.h
@@ -104,7 +104,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/cris/include/asm/atomic.h

View file

diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h
index 5718dd8..a6aca81 100644
--- a/arch/cris/include/asm/atomic.h
+++ b/arch/cris/include/asm/atomic.h
@@ -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__after_atomic_inc()     barrier()
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif

arch/cris/include/asm/bitsperlong.h

View file

diff --git a/arch/cris/include/asm/bitsperlong.h b/arch/cris/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/cris/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/cris/include/asm/mman.h

View file

diff --git a/arch/cris/include/asm/mman.h b/arch/cris/include/asm/mman.h
index 1c35e1b..b7f0afb 100644
--- a/arch/cris/include/asm/mman.h
+++ b/arch/cris/include/asm/mman.h
@@ -3,7 +3,7 @@
 
 /* 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_DENYWRITE	0x0800		/* ETXTBSY */

arch/cris/include/asm/page.h

View file

diff --git a/arch/cris/include/asm/page.h b/arch/cris/include/asm/page.h
index f3fdbd0..be45ee3 100644
--- a/arch/cris/include/asm/page.h
+++ b/arch/cris/include/asm/page.h
@@ -68,7 +68,7 @@ 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 /* _CRIS_PAGE_H */
 

arch/cris/include/asm/signal.h

View file

diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h
index 349ae68..ea6af9a 100644
--- a/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/frv/include/asm/atomic.h

View file

diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
index 296c35c..0409d98 100644
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
@@ -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)
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif /* _ASM_ATOMIC_H */

arch/frv/include/asm/bitsperlong.h

View file

diff --git a/arch/frv/include/asm/bitsperlong.h b/arch/frv/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/frv/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/frv/include/asm/mman.h

View file

diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/asm/mman.h
index b4371e9..58c1d11 100644
--- a/arch/frv/include/asm/mman.h
+++ b/arch/frv/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __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_DENYWRITE	0x0800		/* ETXTBSY */

arch/frv/include/asm/page.h

View file

diff --git a/arch/frv/include/asm/page.h b/arch/frv/include/asm/page.h
index bd9c220..25c6a50 100644
--- a/arch/frv/include/asm/page.h
+++ b/arch/frv/include/asm/page.h
@@ -73,6 +73,6 @@ extern unsigned long max_pfn;
 #endif /* __ASSEMBLY__ */
 
 #include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
 
 #endif /* _ASM_PAGE_H */

arch/frv/include/asm/pci.h

View file

diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index cc685e6..492b5c4 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -10,8 +10,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#ifndef ASM_PCI_H
-#define	ASM_PCI_H
+#ifndef _ASM_FRV_PCI_H
+#define _ASM_FRV_PCI_H
 
 #include <linux/mm.h>
 #include <asm/scatterlist.h>
@@ -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. */
 #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... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
 #define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
@@ -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]));
 }
 
-
-#endif
+#endif /* _ASM_FRV_PCI_H */

arch/frv/include/asm/termios.h

View file

diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h
index a62fb58..b4868aa 100644
--- a/arch/frv/include/asm/termios.h
+++ b/arch/frv/include/asm/termios.h
@@ -52,7 +52,7 @@ struct termio {
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
 #ifdef __KERNEL__
-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>
 #endif
 
 #endif /* _ASM_TERMIOS_H */

arch/h8300/include/asm/atomic.h

View file

diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h
index 833186c..33c8c0f 100644
--- a/arch/h8300/include/asm/atomic.h
+++ b/arch/h8300/include/asm/atomic.h
@@ -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__after_atomic_inc() barrier()
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif /* __ARCH_H8300_ATOMIC __ */

arch/h8300/include/asm/bitsperlong.h

View file

diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/h8300/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/h8300/include/asm/mman.h

View file

diff --git a/arch/h8300/include/asm/mman.h b/arch/h8300/include/asm/mman.h
index b9f104f..cf35f0a 100644
--- a/arch/h8300/include/asm/mman.h
+++ b/arch/h8300/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __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_DENYWRITE	0x0800		/* ETXTBSY */

arch/h8300/include/asm/page.h

View file

diff --git a/arch/h8300/include/asm/page.h b/arch/h8300/include/asm/page.h
index 0b6acf0..837381a 100644
--- a/arch/h8300/include/asm/page.h
+++ b/arch/h8300/include/asm/page.h
@@ -73,6 +73,6 @@ extern unsigned long memory_end;
 #endif /* __ASSEMBLY__ */
 
 #include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
 
 #endif /* _H8300_PAGE_H */

arch/h8300/include/asm/signal.h

View file

diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h
index 7bc1504..fd8b66e 100644
--- a/arch/h8300/include/asm/signal.h
+++ b/arch/h8300/include/asm/signal.h
@@ -105,7 +105,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/ia64/include/asm/atomic.h

View file

diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index d37292b..88405cb 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -216,5 +216,5 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
 #define smp_mb__before_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 */

arch/ia64/include/asm/bitsperlong.h

View file

diff --git a/arch/ia64/include/asm/bitsperlong.h b/arch/ia64/include/asm/bitsperlong.h
new file mode 100644
index 0000000..ec4db3c
--- /dev/null
+++ b/arch/ia64/include/asm/bitsperlong.h
@@ -0,0 +1,8 @@
+#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 */

arch/ia64/include/asm/mman.h

View file

diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h
index c73b878..48cf8b9 100644
--- a/arch/ia64/include/asm/mman.h
+++ b/arch/ia64/include/asm/mman.h
@@ -8,7 +8,7 @@
  *	David Mosberger-Tang <[email protected]>, Hewlett-Packard Co
  */
 
-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>
 
 #define MAP_GROWSDOWN	0x00100		/* stack-like segment */
 #define MAP_GROWSUP	0x00200		/* register stack-like segment */

arch/ia64/include/asm/signal.h

View file

diff --git a/arch/ia64/include/asm/signal.h b/arch/ia64/include/asm/signal.h
index 4f5ca56..b166248 100644
--- a/arch/ia64/include/asm/signal.h
+++ b/arch/ia64/include/asm/signal.h
@@ -114,7 +114,7 @@
 
 #endif /* __KERNEL__ */
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 # ifndef __ASSEMBLY__
 

arch/ia64/include/asm/types.h

View file

diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index e36b371..fbf1ed3 100644
--- a/arch/ia64/include/asm/types.h
+++ b/arch/ia64/include/asm/types.h
@@ -19,10 +19,6 @@
 # define __IA64_UL(x)		(x)
 # define __IA64_UL_CONST(x)	x
 
-# ifdef __KERNEL__
-#  define BITS_PER_LONG 64
-# endif
-
 #else
 # define __IA64_UL(x)		((unsigned long)(x))
 # define __IA64_UL_CONST(x)	x##UL
@@ -34,10 +30,7 @@ typedef unsigned int umode_t;
  */
 # ifdef __KERNEL__
 
-#define BITS_PER_LONG 64
-
 /* DMA addresses are 64-bits wide, in general.  */
-
 typedef u64 dma_addr_t;
 
 # endif /* __KERNEL__ */

arch/m32r/include/asm/atomic.h

View file

diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h
index 2eed30f..63f0cf0 100644
--- a/arch/m32r/include/asm/atomic.h
+++ b/arch/m32r/include/asm/atomic.h
@@ -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__after_atomic_inc()	barrier()
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif	/* _ASM_M32R_ATOMIC_H */

arch/m32r/include/asm/bitsperlong.h

View file

diff --git a/arch/m32r/include/asm/bitsperlong.h b/arch/m32r/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/m32r/include/asm/bitsperlong.h
@@ -0,0 +1 @@
+#include <asm-generic/bitsperlong.h>

arch/m32r/include/asm/mman.h

View file

diff --git a/arch/m32r/include/asm/mman.h b/arch/m32r/include/asm/mman.h
index 516a897..04a5f40 100644
--- a/arch/m32r/include/asm/mman.h
+++ b/arch/m32r/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __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_DENYWRITE	0x0800		/* ETXTBSY */

arch/m32r/include/asm/page.h

View file

diff --git a/arch/m32r/include/asm/page.h b/arch/m32r/include/asm/page.h
index c933308..11777f7 100644
--- a/arch/m32r/include/asm/page.h
+++ b/arch/m32r/include/asm/page.h
@@ -82,6 +82,6 @@ typedef struct page *pgtable_t;
 #define devmem_is_allowed(x) 1
 
 #include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
+#include <asm-generic/getorder.h>
 
 #endif /* _ASM_M32R_PAGE_H */

arch/m32r/include/asm/pci.h

View file

diff --git a/arch/m32r/include/asm/pci.h b/arch/m32r/include/asm/pci.h
index fe785d1..07d3834 100644
--- a/arch/m32r/include/asm/pci.h
+++ b/arch/m32r/include/asm/pci.h
@@ -3,6 +3,4 @@
 
 #include <asm-generic/pci.h>
 
-#define PCI_DMA_BUS_IS_PHYS	(1)
-
 #endif /* _ASM_M32R_PCI_H */

arch/m32r/include/asm/signal.h

View file

diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h
index 1a60706..9c1acb2 100644
--- a/arch/m32r/include/asm/signal.h
+++ b/arch/m32r/include/asm/signal.h
@@ -107,7 +107,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
 
 #ifdef __KERNEL__
 struct old_sigaction {

arch/m68k/include/asm/atomic_mm.h

View file

diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic_mm.h
index eb0ab9d..88b7af2 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)
 #define smp_mb__before_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 __ */

arch/m68k/include/asm/atomic_no.h

View file

diff --git a/arch/m68k/include/asm/atomic_no.h b/arch/m68k/include/asm/atomic_no.h
index 6bb6748..5674cb9 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)
 #define atomic_dec_return(v) atomic_sub_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 __ */

arch/m68k/include/asm/bitsperlong.h

View file

diff --git a/arch/m68k/include/asm/bitsperlong.h b/arch/m68k/include/asm/bitsperlong.h
new file mode 100644
index 0000000..6dc0bb0
--- /dev/null
+++ b/arch/m68k/include/asm/bitsperlong.h
@@ -0,0 +1 @@

This diff is incomplete. Download the complete patch.