From 0e9224796fb07dea6f46f6bca80d91693c6f5226 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 18 Feb 2008 14:13:43 -0800 Subject: [PATCH] --- yaml --- r: 87395 b: refs/heads/master c: d912e1dc8bb5718c3603beb43d0770dac0271374 h: refs/heads/master i: 87393: 74ee6f83b924beab311486e38799eae20e97ffa0 87391: ab99768d75ab83548794972c037b6ba9d3f7624d v: v3 --- [refs] | 2 +- trunk/include/asm-parisc/fixmap.h | 9 ++++++++- trunk/include/asm-parisc/pgtable.h | 8 -------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e08488126281..5a0cf9ffdfe7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff80c66ab637df825122558d1f3f3cbdd830f962 +refs/heads/master: d912e1dc8bb5718c3603beb43d0770dac0271374 diff --git a/trunk/include/asm-parisc/fixmap.h b/trunk/include/asm-parisc/fixmap.h index a5caf4b122b7..de3fe3a18229 100644 --- a/trunk/include/asm-parisc/fixmap.h +++ b/trunk/include/asm-parisc/fixmap.h @@ -20,4 +20,11 @@ #define KERNEL_MAP_START (GATEWAY_PAGE_SIZE) #define KERNEL_MAP_END (TMPALIAS_MAP_START) -#endif +#ifndef __ASSEMBLY__ +extern void *vmalloc_start; +#define PCXL_DMA_MAP_SIZE (8*1024*1024) +#define VMALLOC_START ((unsigned long)vmalloc_start) +#define VMALLOC_END (KERNEL_MAP_END) +#endif /*__ASSEMBLY__*/ + +#endif /*_ASM_FIXMAP_H*/ diff --git a/trunk/include/asm-parisc/pgtable.h b/trunk/include/asm-parisc/pgtable.h index cd0fa4f73320..dc86adbec916 100644 --- a/trunk/include/asm-parisc/pgtable.h +++ b/trunk/include/asm-parisc/pgtable.h @@ -116,14 +116,6 @@ #define FIRST_USER_ADDRESS 0 -#ifndef __ASSEMBLY__ -extern void *vmalloc_start; -#define PCXL_DMA_MAP_SIZE (8*1024*1024) -#define VMALLOC_START ((unsigned long)vmalloc_start) -/* this is a fixmap remnant, see fixmap.h */ -#define VMALLOC_END (KERNEL_MAP_END) -#endif - /* NB: The tlb miss handlers make certain assumptions about the order */ /* of the following bits, so be careful (One example, bits 25-31 */ /* are moved together in one instruction). */