summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/pat.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-24 23:52:27 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-24 23:52:27 +0300
commit87b203079ed949de52f0d92aeae20e5e0116c12f (patch)
tree1878756f936963822ed2d51a15db1da5814973e7 /arch/x86/include/asm/pat.h
parent58105ef1857112a186696c9b8957020090226a28 (diff)
parenta852cbfaaf8122827602027b1614971cfd832304 (diff)
downloadlinux-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.xz
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'arch/x86/include/asm/pat.h')
-rw-r--r--arch/x86/include/asm/pat.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h
index b8493b3b9890..9709fdff6615 100644
--- a/arch/x86/include/asm/pat.h
+++ b/arch/x86/include/asm/pat.h
@@ -5,10 +5,8 @@
#ifdef CONFIG_X86_PAT
extern int pat_enabled;
-extern void validate_pat_support(struct cpuinfo_x86 *c);
#else
static const int pat_enabled;
-static inline void validate_pat_support(struct cpuinfo_x86 *c) { }
#endif
extern void pat_init(void);
@@ -17,6 +15,4 @@ extern int reserve_memtype(u64 start, u64 end,
unsigned long req_type, unsigned long *ret_type);
extern int free_memtype(u64 start, u64 end);
-extern void pat_disable(char *reason);
-
#endif /* _ASM_X86_PAT_H */