summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-23 14:35:10 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-23 14:35:10 +0200
commit14c93e8eba70c3c85d8f8acc6cfdc728aef92076 (patch)
treed5575d386bca0237e91c0ec48be96925658005b7 /arch/x86/include
parent14c0abf14a5e67e793131116bd97f57da37ccce3 (diff)
parentc44c9ec0f38b939b3200436e3aa95c1aa83c41c7 (diff)
downloadop-kernel-dev-14c93e8eba70c3c85d8f8acc6cfdc728aef92076.zip
op-kernel-dev-14c93e8eba70c3c85d8f8acc6cfdc728aef92076.tar.gz
Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/urgent
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pgtable_types.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 7b467bf..d1f4a76 100644
--- 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;
+extern void set_nx(void);
extern int nx_enabled;
#define pgprot_writecombine pgprot_writecombine
OpenPOWER on IntegriCloud