diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:36:21 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:50:36 +0000 |
| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /arch/x86/kernel/entry_32.S | |
| parent | 60de2ba51eaba9eefcc355cb20c8582b1481e755 (diff) | |
| parent | 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 59e175e8959..591e6010427 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -395,7 +395,7 @@ sysenter_past_esp: * A tiny bit of offset fixup is necessary - 4*4 means the 4 words * pushed above; +8 corresponds to copy_thread's esp0 setting. */ - pushl_cfi (TI_sysenter_return-THREAD_SIZE_asm+8+4*4)(%esp) + pushl_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp) CFI_REL_OFFSET eip, 0 pushl_cfi %eax |