diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /arch/i386/kernel/entry.S | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index d9a260f2efb4..37a7d2eaf4a0 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
| @@ -204,7 +204,7 @@ VM_MASK = 0x00020000 | |||
| 204 | ENTRY(ret_from_fork) | 204 | ENTRY(ret_from_fork) |
| 205 | CFI_STARTPROC | 205 | CFI_STARTPROC |
| 206 | pushl %eax | 206 | pushl %eax |
| 207 | CFI_ADJUST_CFA_OFFSET -4 | 207 | CFI_ADJUST_CFA_OFFSET 4 |
| 208 | call schedule_tail | 208 | call schedule_tail |
| 209 | GET_THREAD_INFO(%ebp) | 209 | GET_THREAD_INFO(%ebp) |
| 210 | popl %eax | 210 | popl %eax |