tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86, um: get rid of uml highmem.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

authored by

Al Viro and committed by
H. Peter Anvin fe1cd987 ff64b4c1

+14 -17
+5 -5
arch/um/include/asm/archparam-i386.h
··· 6 6 #ifndef __UM_ARCHPARAM_I386_H 7 7 #define __UM_ARCHPARAM_I386_H 8 8 9 - /********* Nothing for asm-um/hardirq.h **********/ 10 - 11 - /********* Nothing for asm-um/hw_irq.h **********/ 12 - 13 - /********* Nothing for asm-um/string.h **********/ 9 + #ifdef CONFIG_X86_PAE 10 + #define LAST_PKMAP 512 11 + #else 12 + #define LAST_PKMAP 1024 13 + #endif 14 14 15 15 #endif 16 16
+1
arch/um/include/asm/fixmap.h
··· 6 6 #include <asm/kmap_types.h> 7 7 #include <asm/archparam.h> 8 8 #include <asm/page.h> 9 + #include <linux/threads.h> 9 10 10 11 /* 11 12 * Here we define all the compile-time 'special' virtual
-12
arch/um/include/asm/highmem.h
··· 1 - #ifndef __UM_HIGHMEM_H 2 - #define __UM_HIGHMEM_H 3 - 4 - #include "asm/page.h" 5 - #include "asm/fixmap.h" 6 - #include "asm/arch/highmem.h" 7 - 8 - #undef PKMAP_BASE 9 - 10 - #define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK) 11 - 12 - #endif
+8
arch/um/include/asm/pgtable.h
··· 47 47 48 48 #define VMALLOC_OFFSET (__va_space) 49 49 #define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) 50 + #define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK) 50 51 #ifdef CONFIG_HIGHMEM 51 52 # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) 52 53 #else ··· 355 354 #define kern_addr_valid(addr) (1) 356 355 357 356 #include <asm-generic/pgtable.h> 357 + 358 + /* Clear a kernel PTE and flush it from the TLB */ 359 + #define kpte_clear_flush(ptep, vaddr) \ 360 + do { \ 361 + pte_clear(&init_mm, (vaddr), (ptep)); \ 362 + __flush_tlb_one((vaddr)); \ 363 + } while (0) 358 364 359 365 #endif