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/x86_64/ia32/ia32entry.S | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/x86_64/ia32/ia32entry.S')
| -rw-r--r-- | arch/x86_64/ia32/ia32entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index 9b5bb413a6e9..5d4a7d125ed0 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S | |||
| @@ -103,7 +103,7 @@ ENTRY(ia32_sysenter_target) | |||
| 103 | pushq %rax | 103 | pushq %rax |
| 104 | CFI_ADJUST_CFA_OFFSET 8 | 104 | CFI_ADJUST_CFA_OFFSET 8 |
| 105 | cld | 105 | cld |
| 106 | SAVE_ARGS 0,0,1 | 106 | SAVE_ARGS 0,0,0 |
| 107 | /* no need to do an access_ok check here because rbp has been | 107 | /* no need to do an access_ok check here because rbp has been |
| 108 | 32bit zero extended */ | 108 | 32bit zero extended */ |
| 109 | 1: movl (%rbp),%r9d | 109 | 1: movl (%rbp),%r9d |