diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 14:48:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 14:48:20 -0400 |
| commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
| tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /Documentation/x86 | |
| parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
| parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/entry_64.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt index 9132b86176a3..33884d156125 100644 --- a/Documentation/x86/entry_64.txt +++ b/Documentation/x86/entry_64.txt | |||
| @@ -18,10 +18,10 @@ Some of these entries are: | |||
| 18 | 18 | ||
| 19 | - system_call: syscall instruction from 64-bit code. | 19 | - system_call: syscall instruction from 64-bit code. |
| 20 | 20 | ||
| 21 | - ia32_syscall: int 0x80 from 32-bit or 64-bit code; compat syscall | 21 | - entry_INT80_compat: int 0x80 from 32-bit or 64-bit code; compat syscall |
| 22 | either way. | 22 | either way. |
| 23 | 23 | ||
| 24 | - ia32_syscall, ia32_sysenter: syscall and sysenter from 32-bit | 24 | - entry_INT80_compat, ia32_sysenter: syscall and sysenter from 32-bit |
| 25 | code | 25 | code |
| 26 | 26 | ||
| 27 | - interrupt: An array of entries. Every IDT vector that doesn't | 27 | - interrupt: An array of entries. Every IDT vector that doesn't |