diff options
-rw-r--r-- | arch/alpha/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/avr32/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/cris/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/frv/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/h8300/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/ia64/include/asm/scatterlist.h | 9 | ||||
-rw-r--r-- | arch/m32r/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/scatterlist.h | 3 | ||||
-rw-r--r-- | arch/microblaze/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/mn10300/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/parisc/include/asm/scatterlist.h | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/scatterlist.h | 3 | ||||
-rw-r--r-- | arch/s390/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/score/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/scatterlist.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/scatterlist.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/scatterlist.h | 1 | ||||
-rw-r--r-- | arch/xtensa/include/asm/scatterlist.h | 2 |
20 files changed, 0 insertions, 46 deletions
diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h index 5728c52a7412..017d7471c3c4 100644 --- a/arch/alpha/include/asm/scatterlist.h +++ b/arch/alpha/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (~0UL) | ||
7 | |||
8 | #endif /* !(_ALPHA_SCATTERLIST_H) */ | 6 | #endif /* !(_ALPHA_SCATTERLIST_H) */ |
diff --git a/arch/avr32/include/asm/scatterlist.h b/arch/avr32/include/asm/scatterlist.h index 06394e5ead6c..a5902d9834e8 100644 --- a/arch/avr32/include/asm/scatterlist.h +++ b/arch/avr32/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0xffffffff) | ||
7 | |||
8 | #endif /* __ASM_AVR32_SCATTERLIST_H */ | 6 | #endif /* __ASM_AVR32_SCATTERLIST_H */ |
diff --git a/arch/blackfin/include/asm/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h index 64d41d34ab0b..d177a1588958 100644 --- a/arch/blackfin/include/asm/scatterlist.h +++ b/arch/blackfin/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0xffffffff) | ||
7 | |||
8 | #endif /* !(_BLACKFIN_SCATTERLIST_H) */ | 6 | #endif /* !(_BLACKFIN_SCATTERLIST_H) */ |
diff --git a/arch/cris/include/asm/scatterlist.h b/arch/cris/include/asm/scatterlist.h index 249a7842ff5f..f11f8f40ec4a 100644 --- a/arch/cris/include/asm/scatterlist.h +++ b/arch/cris/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0x1fffffff) | ||
7 | |||
8 | #endif /* !(__ASM_CRIS_SCATTERLIST_H) */ | 6 | #endif /* !(__ASM_CRIS_SCATTERLIST_H) */ |
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h index 1614bfd7e3a4..0e5eb3018468 100644 --- a/arch/frv/include/asm/scatterlist.h +++ b/arch/frv/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0xffffffffUL) | ||
7 | |||
8 | #endif /* !_ASM_SCATTERLIST_H */ | 6 | #endif /* !_ASM_SCATTERLIST_H */ |
diff --git a/arch/h8300/include/asm/scatterlist.h b/arch/h8300/include/asm/scatterlist.h index de08a4a2cc1c..82130eda0e5f 100644 --- a/arch/h8300/include/asm/scatterlist.h +++ b/arch/h8300/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0xffffffff) | ||
7 | |||
8 | #endif /* !(_H8300_SCATTERLIST_H) */ | 6 | #endif /* !(_H8300_SCATTERLIST_H) */ |
diff --git a/arch/ia64/include/asm/scatterlist.h b/arch/ia64/include/asm/scatterlist.h index f299a4fb25c8..08fd93bff1db 100644 --- a/arch/ia64/include/asm/scatterlist.h +++ b/arch/ia64/include/asm/scatterlist.h | |||
@@ -2,15 +2,6 @@ | |||
2 | #define _ASM_IA64_SCATTERLIST_H | 2 | #define _ASM_IA64_SCATTERLIST_H |
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | /* | ||
6 | * It used to be that ISA_DMA_THRESHOLD had something to do with the | ||
7 | * DMA-limits of ISA-devices. Nowadays, its only remaining use (apart | ||
8 | * from the aha1542.c driver, which isn't 64-bit clean anyhow) is to | ||
9 | * tell the block-layer (via BLK_BOUNCE_ISA) what the max. physical | ||
10 | * address of a page is that is allocated with GFP_DMA. On IA-64, | ||
11 | * that's 4GB - 1. | ||
12 | */ | ||
13 | #define ISA_DMA_THRESHOLD 0xffffffff | ||
14 | #define ARCH_HAS_SG_CHAIN | 5 | #define ARCH_HAS_SG_CHAIN |
15 | 6 | ||
16 | #endif /* _ASM_IA64_SCATTERLIST_H */ | 7 | #endif /* _ASM_IA64_SCATTERLIST_H */ |
diff --git a/arch/m32r/include/asm/scatterlist.h b/arch/m32r/include/asm/scatterlist.h index aeeddd8dac17..7370b8b6243e 100644 --- a/arch/m32r/include/asm/scatterlist.h +++ b/arch/m32r/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0x1fffffff) | ||
7 | |||
8 | #endif /* _ASM_M32R_SCATTERLIST_H */ | 6 | #endif /* _ASM_M32R_SCATTERLIST_H */ |
diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h index 175da06c6b95..312505452a1e 100644 --- a/arch/m68k/include/asm/scatterlist.h +++ b/arch/m68k/include/asm/scatterlist.h | |||
@@ -3,7 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | /* This is bogus and should go away. */ | ||
7 | #define ISA_DMA_THRESHOLD (0x00ffffff) | ||
8 | |||
9 | #endif /* !(_M68K_SCATTERLIST_H) */ | 6 | #endif /* !(_M68K_SCATTERLIST_H) */ |
diff --git a/arch/microblaze/include/asm/scatterlist.h b/arch/microblaze/include/asm/scatterlist.h index dc4a8900cc80..35d786fe93ae 100644 --- a/arch/microblaze/include/asm/scatterlist.h +++ b/arch/microblaze/include/asm/scatterlist.h | |||
@@ -1,3 +1 @@ | |||
1 | #include <asm-generic/scatterlist.h> | #include <asm-generic/scatterlist.h> | |
2 | |||
3 | #define ISA_DMA_THRESHOLD (~0UL) | ||
diff --git a/arch/mips/include/asm/scatterlist.h b/arch/mips/include/asm/scatterlist.h index 9af65e79be36..7ee0e646d82c 100644 --- a/arch/mips/include/asm/scatterlist.h +++ b/arch/mips/include/asm/scatterlist.h | |||
@@ -3,6 +3,4 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0x00ffffffUL) | ||
7 | |||
8 | #endif /* __ASM_SCATTERLIST_H */ | 6 | #endif /* __ASM_SCATTERLIST_H */ |
diff --git a/arch/mn10300/include/asm/scatterlist.h b/arch/mn10300/include/asm/scatterlist.h index 7bd00b9e030d..7baa4006008a 100644 --- a/arch/mn10300/include/asm/scatterlist.h +++ b/arch/mn10300/include/asm/scatterlist.h | |||
@@ -13,6 +13,4 @@ | |||
13 | 13 | ||
14 | #include <asm-generic/scatterlist.h> | 14 | #include <asm-generic/scatterlist.h> |
15 | 15 | ||
16 | #define ISA_DMA_THRESHOLD (0x00ffffff) | ||
17 | |||
18 | #endif /* _ASM_SCATTERLIST_H */ | 16 | #endif /* _ASM_SCATTERLIST_H */ |
diff --git a/arch/parisc/include/asm/scatterlist.h b/arch/parisc/include/asm/scatterlist.h index 2c3b79b54b28..8bf1f0dd1f15 100644 --- a/arch/parisc/include/asm/scatterlist.h +++ b/arch/parisc/include/asm/scatterlist.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <asm/types.h> | 5 | #include <asm/types.h> |
6 | #include <asm-generic/scatterlist.h> | 6 | #include <asm-generic/scatterlist.h> |
7 | 7 | ||
8 | #define ISA_DMA_THRESHOLD (~0UL) | ||
9 | #define sg_virt_addr(sg) ((unsigned long)sg_virt(sg)) | 8 | #define sg_virt_addr(sg) ((unsigned long)sg_virt(sg)) |
10 | 9 | ||
11 | #endif /* _ASM_PARISC_SCATTERLIST_H */ | 10 | #endif /* _ASM_PARISC_SCATTERLIST_H */ |
diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h index 34cc78fd0ef4..de1f620bd5c9 100644 --- a/arch/powerpc/include/asm/scatterlist.h +++ b/arch/powerpc/include/asm/scatterlist.h | |||
@@ -12,9 +12,6 @@ | |||
12 | #include <asm/dma.h> | 12 | #include <asm/dma.h> |
13 | #include <asm-generic/scatterlist.h> | 13 | #include <asm-generic/scatterlist.h> |
14 | 14 | ||
15 | #ifdef __powerpc64__ | ||
16 | #define ISA_DMA_THRESHOLD (~0UL) | ||
17 | #endif | ||
18 | #define ARCH_HAS_SG_CHAIN | 15 | #define ARCH_HAS_SG_CHAIN |
19 | 16 | ||
20 | #endif /* _ASM_POWERPC_SCATTERLIST_H */ | 17 | #endif /* _ASM_POWERPC_SCATTERLIST_H */ |
diff --git a/arch/s390/include/asm/scatterlist.h b/arch/s390/include/asm/scatterlist.h index be44d94cba54..35d786fe93ae 100644 --- a/arch/s390/include/asm/scatterlist.h +++ b/arch/s390/include/asm/scatterlist.h | |||
@@ -1,3 +1 @@ | |||
1 | #define ISA_DMA_THRESHOLD (~0UL) | ||
2 | |||
3 | #include <asm-generic/scatterlist.h> | #include <asm-generic/scatterlist.h> | |
diff --git a/arch/score/include/asm/scatterlist.h b/arch/score/include/asm/scatterlist.h index 4fa1a6658215..9f533b8362c7 100644 --- a/arch/score/include/asm/scatterlist.h +++ b/arch/score/include/asm/scatterlist.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef _ASM_SCORE_SCATTERLIST_H | 1 | #ifndef _ASM_SCORE_SCATTERLIST_H |
2 | #define _ASM_SCORE_SCATTERLIST_H | 2 | #define _ASM_SCORE_SCATTERLIST_H |
3 | 3 | ||
4 | #define ISA_DMA_THRESHOLD (~0UL) | ||
5 | |||
6 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
7 | 5 | ||
8 | #endif /* _ASM_SCORE_SCATTERLIST_H */ | 6 | #endif /* _ASM_SCORE_SCATTERLIST_H */ |
diff --git a/arch/sh/include/asm/scatterlist.h b/arch/sh/include/asm/scatterlist.h index e38d1d4c7f6f..98dfc3510f10 100644 --- a/arch/sh/include/asm/scatterlist.h +++ b/arch/sh/include/asm/scatterlist.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __ASM_SH_SCATTERLIST_H | 1 | #ifndef __ASM_SH_SCATTERLIST_H |
2 | #define __ASM_SH_SCATTERLIST_H | 2 | #define __ASM_SH_SCATTERLIST_H |
3 | 3 | ||
4 | #define ISA_DMA_THRESHOLD phys_addr_mask() | ||
5 | |||
6 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
7 | 5 | ||
8 | #endif /* __ASM_SH_SCATTERLIST_H */ | 6 | #endif /* __ASM_SH_SCATTERLIST_H */ |
diff --git a/arch/sparc/include/asm/scatterlist.h b/arch/sparc/include/asm/scatterlist.h index 433e45f05fd4..92bb638313f8 100644 --- a/arch/sparc/include/asm/scatterlist.h +++ b/arch/sparc/include/asm/scatterlist.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (~0UL) | ||
7 | #define ARCH_HAS_SG_CHAIN | 6 | #define ARCH_HAS_SG_CHAIN |
8 | 7 | ||
9 | #endif /* !(_SPARC_SCATTERLIST_H) */ | 8 | #endif /* !(_SPARC_SCATTERLIST_H) */ |
diff --git a/arch/x86/include/asm/scatterlist.h b/arch/x86/include/asm/scatterlist.h index fb0b1874396f..4240878b9d76 100644 --- a/arch/x86/include/asm/scatterlist.h +++ b/arch/x86/include/asm/scatterlist.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <asm-generic/scatterlist.h> | 4 | #include <asm-generic/scatterlist.h> |
5 | 5 | ||
6 | #define ISA_DMA_THRESHOLD (0x00ffffff) | ||
7 | #define ARCH_HAS_SG_CHAIN | 6 | #define ARCH_HAS_SG_CHAIN |
8 | 7 | ||
9 | #endif /* _ASM_X86_SCATTERLIST_H */ | 8 | #endif /* _ASM_X86_SCATTERLIST_H */ |
diff --git a/arch/xtensa/include/asm/scatterlist.h b/arch/xtensa/include/asm/scatterlist.h index b1f9fdc1d5ba..a0421a61d9e1 100644 --- a/arch/xtensa/include/asm/scatterlist.h +++ b/arch/xtensa/include/asm/scatterlist.h | |||
@@ -13,6 +13,4 @@ | |||
13 | 13 | ||
14 | #include <asm-generic/scatterlist.h> | 14 | #include <asm-generic/scatterlist.h> |
15 | 15 | ||
16 | #define ISA_DMA_THRESHOLD (~0UL) | ||
17 | |||
18 | #endif /* _XTENSA_SCATTERLIST_H */ | 16 | #endif /* _XTENSA_SCATTERLIST_H */ |