diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-28 15:15:32 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-28 17:22:32 -0400 |
| commit | db49e9edd88a3f41e7c5f249c26583c579a41bb1 (patch) | |
| tree | 8aa40ec5918044c135000a68524ddee9da2172a3 /linux-2.6-i386-nx-emulation.patch | |
| parent | 561c61e4ca69b9f215c5f476aea5e78928fe4af1 (diff) | |
| download | kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.gz kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.xz kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.zip | |
update to snapshot 2.6.38-git19
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
| -rw-r--r-- | linux-2.6-i386-nx-emulation.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch index da84cc672..3e55b88ca 100644 --- a/linux-2.6-i386-nx-emulation.patch +++ b/linux-2.6-i386-nx-emulation.patch @@ -46,7 +46,7 @@ #endif /* _ASM_X86_DESC_H */ --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h -@@ -7,12 +7,19 @@ +@@ -7,18 +7,25 @@ /* * The x86 doesn't have a mmu context, but * we put the segment information here. @@ -59,10 +59,16 @@ int size; struct mutex lock; void *vdso; + + #ifdef CONFIG_X86_64 + /* True if mm supports a task running in 32 bit compatibility mode. */ + unsigned short ia32_compat; + #endif +#ifdef CONFIG_X86_32 + struct desc_struct user_cs; + unsigned long exec_limit; +#endif + } mm_context_t; #ifdef CONFIG_SMP @@ -472,8 +478,8 @@ --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -101,6 +101,9 @@ struct bio_list; - struct fs_struct; struct perf_event_context; + struct blk_plug; +extern int disable_nx; +extern int print_fatal_signals; |