diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-i386/mmu.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-i386/mmu.h')
| -rw-r--r-- | include/asm-i386/mmu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/mmu.h b/include/asm-i386/mmu.h index f431a0b86d4c..8358dd3df7aa 100644 --- a/include/asm-i386/mmu.h +++ b/include/asm-i386/mmu.h | |||
| @@ -12,6 +12,7 @@ typedef struct { | |||
| 12 | int size; | 12 | int size; |
| 13 | struct semaphore sem; | 13 | struct semaphore sem; |
| 14 | void *ldt; | 14 | void *ldt; |
| 15 | void *vdso; | ||
| 15 | } mm_context_t; | 16 | } mm_context_t; |
| 16 | 17 | ||
| 17 | #endif | 18 | #endif |