diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 17:28:20 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:21 -0400 |
commit | 106619c440a7cd5a100eaba38665231ab8c762b8 (patch) | |
tree | baa2945aa5bd1ef77ece0bd85609b4097bbd730b | |
parent | 1f7afb08a595292d946a5f1fd4929c81db7042d2 (diff) |
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: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | include/asm-x86/fb.h | 20 | ||||
-rw-r--r-- | include/asm-x86/fb_32.h | 17 | ||||
-rw-r--r-- | include/asm-x86/fb_64.h | 19 |
3 files changed, 18 insertions, 38 deletions
diff --git a/include/asm-x86/fb.h b/include/asm-x86/fb.h index 238c7ca45877..53018464aea6 100644 --- a/include/asm-x86/fb.h +++ b/include/asm-x86/fb.h | |||
@@ -1,5 +1,21 @@ | |||
1 | #ifndef _ASM_X86_FB_H | ||
2 | #define _ASM_X86_FB_H | ||
3 | |||
4 | #include <linux/fb.h> | ||
5 | #include <linux/fs.h> | ||
6 | #include <asm/page.h> | ||
7 | |||
8 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
9 | unsigned long off) | ||
10 | { | ||
11 | if (boot_cpu_data.x86 > 3) | ||
12 | pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; | ||
13 | } | ||
14 | |||
1 | #ifdef CONFIG_X86_32 | 15 | #ifdef CONFIG_X86_32 |
2 | # include "fb_32.h" | 16 | extern int fb_is_primary_device(struct fb_info *info); |
3 | #else | 17 | #else |
4 | # include "fb_64.h" | 18 | static inline int fb_is_primary_device(struct fb_info *info) { return 0; } |
5 | #endif | 19 | #endif |
20 | |||
21 | #endif /* _ASM_X86_FB_H */ | ||
diff --git a/include/asm-x86/fb_32.h b/include/asm-x86/fb_32.h deleted file mode 100644 index d1c6297d4a61..000000000000 --- a/include/asm-x86/fb_32.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fb.h> | ||
5 | #include <linux/fs.h> | ||
6 | #include <asm/page.h> | ||
7 | |||
8 | extern int fb_is_primary_device(struct fb_info *info); | ||
9 | |||
10 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
11 | unsigned long off) | ||
12 | { | ||
13 | if (boot_cpu_data.x86 > 3) | ||
14 | pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; | ||
15 | } | ||
16 | |||
17 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-x86/fb_64.h b/include/asm-x86/fb_64.h deleted file mode 100644 index 60548e651d12..000000000000 --- a/include/asm-x86/fb_64.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | #include <linux/fb.h> | ||
4 | #include <linux/fs.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
8 | unsigned long off) | ||
9 | { | ||
10 | if (boot_cpu_data.x86 > 3) | ||
11 | pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; | ||
12 | } | ||
13 | |||
14 | static inline int fb_is_primary_device(struct fb_info *info) | ||
15 | { | ||
16 | return 0; | ||
17 | } | ||
18 | |||
19 | #endif /* _ASM_FB_H_ */ | ||