Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec96783 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: make clear_fixmap() available on 64-bit as well 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b69d3987

include/asm-x86/fixmap.h

+8 −0
Original line number Diff line number Diff line 
#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H



#ifdef CONFIG_X86_32

# include "fixmap_32.h"

#else

# include "fixmap_64.h"

#endif



#define clear_fixmap(idx)			\

	__set_fixmap(idx, 0, __pgprot(0))



#endif

include/asm-x86/fixmap_32.h

+2 −5
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999

 */



#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H

#ifndef _ASM_FIXMAP_32_H

#define _ASM_FIXMAP_32_H





/* used by vmalloc.c, vsyscall.lds.S.
@@ -121,9 +121,6 @@ extern void reserve_top_address(unsigned long reserve); 
#define set_fixmap_nocache(idx, phys)			\

	__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)



#define clear_fixmap(idx)			\

	__set_fixmap(idx, 0, __pgprot(0))



#define FIXADDR_TOP	((unsigned long)__FIXADDR_TOP)



#define __FIXADDR_SIZE	(__end_of_permanent_fixed_addresses << PAGE_SHIFT)

include/asm-x86/fixmap_64.h

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 * Copyright (C) 1998 Ingo Molnar

 */



#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H

#ifndef _ASM_FIXMAP_64_H

#define _ASM_FIXMAP_64_H



#include <linux/kernel.h>

#include <asm/apicdef.h>