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

Commit 106619c4 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

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



Same file, except for whitespace, comment formatting and the two variants
of fb_is_primary_device()

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

include/asm-x86/fb.h

+18 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_FB_H

#define _ASM_X86_FB_H



#include <linux/fb.h>

#include <linux/fs.h>

#include <asm/page.h>



static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,

				unsigned long off)

{

	if (boot_cpu_data.x86 > 3)

		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;

}



#ifdef CONFIG_X86_32

# include "fb_32.h"

extern int fb_is_primary_device(struct fb_info *info);

#else

# include "fb_64.h"

static inline int fb_is_primary_device(struct fb_info *info) { return 0; }

#endif



#endif /* _ASM_X86_FB_H */

include/asm-x86/fb_32.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_



#include <linux/fb.h>

#include <linux/fs.h>

#include <asm/page.h>



extern int fb_is_primary_device(struct fb_info *info);



static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,

				unsigned long off)

{

	if (boot_cpu_data.x86 > 3)

		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;

}



#endif /* _ASM_FB_H_ */

include/asm-x86/fb_64.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#ifndef _ASM_FB_H_

#define _ASM_FB_H_

#include <linux/fb.h>

#include <linux/fs.h>

#include <asm/page.h>



static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,

				unsigned long off)

{

	if (boot_cpu_data.x86 > 3)

		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;

}



static inline int fb_is_primary_device(struct fb_info *info)

{

	return 0;

}



#endif /* _ASM_FB_H_ */