AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86, um: get rid of uml highmem.h

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Al Viro 2008-08-18 04:15:12 -04:00 committed by H. Peter Anvin
parent ff64b4c186
commit fe1cd9876f
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/um/include/asm/archparam-i386.h
View File

@ -6,11 +6,11 @@
#ifndef __UM_ARCHPARAM_I386_H #ifndef __UM_ARCHPARAM_I386_H
#define __UM_ARCHPARAM_I386_H #define __UM_ARCHPARAM_I386_H
/********* Nothing for asm-um/hardirq.h **********/ #ifdef CONFIG_X86_PAE
#define LAST_PKMAP 512
/********* Nothing for asm-um/hw_irq.h **********/ #else
#define LAST_PKMAP 1024
/********* Nothing for asm-um/string.h **********/ #endif
#endif #endif

1
arch/um/include/asm/fixmap.h
View File

@ -6,6 +6,7 @@
#include <asm/kmap_types.h> #include <asm/kmap_types.h>
#include <asm/archparam.h> #include <asm/archparam.h>
#include <asm/page.h> #include <asm/page.h>
#include <linux/threads.h>
/* /*
* Here we define all the compile-time 'special' virtual * Here we define all the compile-time 'special' virtual

12
arch/um/include/asm/highmem.h
View File

@ -1,12 +0,0 @@
#ifndef __UM_HIGHMEM_H
#define __UM_HIGHMEM_H
#include "asm/page.h"
#include "asm/fixmap.h"
#include "asm/arch/highmem.h"
#undef PKMAP_BASE
#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
#endif

8
arch/um/include/asm/pgtable.h
View File

@ -47,6 +47,7 @@ extern unsigned long end_iomem;
#define VMALLOC_OFFSET (__va_space) #define VMALLOC_OFFSET (__va_space)
#define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) #define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
# define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE)
#else #else
@ -355,4 +356,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
pte_clear(&init_mm, (vaddr), (ptep)); \
__flush_tlb_one((vaddr)); \
} while (0)
#endif #endif