diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-23 08:35:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-23 08:35:10 -0400 |
| commit | 14c93e8eba70c3c85d8f8acc6cfdc728aef92076 (patch) | |
| tree | d5575d386bca0237e91c0ec48be96925658005b7 /arch/x86/include | |
| parent | 14c0abf14a5e67e793131116bd97f57da37ccce3 (diff) | |
| parent | c44c9ec0f38b939b3200436e3aa95c1aa83c41c7 (diff) | |
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.h | 1 |
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 7b467bf3c680..d1f4a760be23 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) | |||
| 277 | typedef struct page *pgtable_t; | 277 | typedef struct page *pgtable_t; |
| 278 | 278 | ||
| 279 | extern pteval_t __supported_pte_mask; | 279 | extern pteval_t __supported_pte_mask; |
| 280 | extern void set_nx(void); | ||
| 280 | extern int nx_enabled; | 281 | extern int nx_enabled; |
| 281 | 282 | ||
| 282 | #define pgprot_writecombine pgprot_writecombine | 283 | #define pgprot_writecombine pgprot_writecombine |