Commit b2bba72c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/cacheflush_32/64.h 



Same file, except for whitespace, comment formatting and the extra
DEBUG_PAGE_ALLOC function in _32.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0b4dc7c3

include/asm-x86/cacheflush.h

+39 −4
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "cacheflush_32.h"

#else

# include "cacheflush_64.h"

#ifndef _ASM_X86_CACHEFLUSH_H

#define _ASM_X86_CACHEFLUSH_H



/* Keep includes the same across arches.  */

#include <linux/mm.h>



/* Caches aren't brain-dead on the intel. */

#define flush_cache_all()			do { } while (0)

#define flush_cache_mm(mm)			do { } while (0)

#define flush_cache_dup_mm(mm)			do { } while (0)

#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)

#define flush_dcache_page(page)			do { } while (0)

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

#define flush_cache_vmap(start, end)		do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



#define copy_to_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)

#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)



void global_flush_tlb(void);

int change_page_attr(struct page *page, int numpages, pgprot_t prot);

int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot);



#ifdef CONFIG_DEBUG_PAGEALLOC

/* internal debugging function */

void kernel_map_pages(struct page *page, int numpages, int enable);

#endif



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

#endif



#endif

include/asm-x86/cacheflush_32.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
#ifndef _I386_CACHEFLUSH_H

#define _I386_CACHEFLUSH_H



/* Keep includes the same across arches.  */

#include <linux/mm.h>



/* Caches aren't brain-dead on the intel. */

#define flush_cache_all()			do { } while (0)

#define flush_cache_mm(mm)			do { } while (0)

#define flush_cache_dup_mm(mm)			do { } while (0)

#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)

#define flush_dcache_page(page)			do { } while (0)

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

#define flush_cache_vmap(start, end)		do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



#define copy_to_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)

#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)



void global_flush_tlb(void); 

int change_page_attr(struct page *page, int numpages, pgprot_t prot);



#ifdef CONFIG_DEBUG_PAGEALLOC

/* internal debugging function */

void kernel_map_pages(struct page *page, int numpages, int enable);

#endif



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

#endif



#endif /* _I386_CACHEFLUSH_H */

include/asm-x86/cacheflush_64.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
#ifndef _X8664_CACHEFLUSH_H

#define _X8664_CACHEFLUSH_H



/* Keep includes the same across arches.  */

#include <linux/mm.h>



/* Caches aren't brain-dead on the intel. */

#define flush_cache_all()			do { } while (0)

#define flush_cache_mm(mm)			do { } while (0)

#define flush_cache_dup_mm(mm)			do { } while (0)

#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)

#define flush_dcache_page(page)			do { } while (0)

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

#define flush_cache_vmap(start, end)		do { } while (0)

#define flush_cache_vunmap(start, end)		do { } while (0)



#define copy_to_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)

#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)



void global_flush_tlb(void); 

int change_page_attr(struct page *page, int numpages, pgprot_t prot);

int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot);



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

#endif



#endif /* _X8664_CACHEFLUSH_H */