summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@digeo.com>2003-05-18 20:27:39 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-05-18 20:27:39 -0700
commit03feb9dba14fc80663a0635add28e3cd80835817 (patch)
tree2cfa71b2600ebea3074534b72677dab2ef9d40d7 /include
parent20db33b00aee2bee475db63ba55df64fe063188d (diff)
[PATCH] large-dma_addr_t-PAE-only.patch
From: William Lee Irwin III <wli@holomorphy.com> I was just looking over this and noticed 2.4.x makes u64 dma_addr_t conditional on CONFIG_HIGHMEM64G where 2.5.x uses CONFIG_HIGHMEM. It's clearly not necessary on CONFIG_HIGHMEM4G, hence this obvious patch.
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index b0d095271284..ced00fe8fe61 100644
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -51,7 +51,7 @@ typedef unsigned long long u64;
/* DMA addresses come in generic and 64-bit flavours. */
-#ifdef CONFIG_HIGHMEM
+#ifdef CONFIG_HIGHMEM64G
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;