git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
include
/
asm
/
pgtable_types.h
diff --git
a/arch/x86/include/asm/pgtable_types.h
b/arch/x86/include/asm/pgtable_types.h
index
7b467bf
..
d1f4a76
100644
(file)
--- a/
arch/x86/include/asm/pgtable_types.h
+++ b/
arch/x86/include/asm/pgtable_types.h
@@
-277,6
+277,7
@@
static inline pteval_t pte_flags(pte_t pte)
typedef struct page *pgtable_t;
extern pteval_t __supported_pte_mask;
typedef struct page *pgtable_t;
extern pteval_t __supported_pte_mask;
+extern void set_nx(void);
extern int nx_enabled;
#define pgprot_writecombine pgprot_writecombine
extern int nx_enabled;
#define pgprot_writecombine pgprot_writecombine