diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/x86_64/ia32 | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/x86_64/ia32')
| -rw-r--r-- | arch/x86_64/ia32/ia32entry.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/ia32/vsyscall-syscall.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/ia32/vsyscall-sysenter.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index f174083d5567..5244f803203d 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <asm/dwarf2.h> | 7 | #include <asm/dwarf2.h> |
| 8 | #include <asm/calling.h> | 8 | #include <asm/calling.h> |
| 9 | #include <asm/offset.h> | 9 | #include <asm/asm-offsets.h> |
| 10 | #include <asm/current.h> | 10 | #include <asm/current.h> |
| 11 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
| 12 | #include <asm/ia32_unistd.h> | 12 | #include <asm/ia32_unistd.h> |
diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86_64/ia32/vsyscall-syscall.S index e2aaf3de8a42..b024965bb689 100644 --- a/arch/x86_64/ia32/vsyscall-syscall.S +++ b/arch/x86_64/ia32/vsyscall-syscall.S | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <asm/ia32_unistd.h> | 5 | #include <asm/ia32_unistd.h> |
| 6 | #include <asm/offset.h> | 6 | #include <asm/asm-offsets.h> |
| 7 | #include <asm/segment.h> | 7 | #include <asm/segment.h> |
| 8 | 8 | ||
| 9 | .text | 9 | .text |
diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86_64/ia32/vsyscall-sysenter.S index 8fb8e0ff3afa..71f3de586b56 100644 --- a/arch/x86_64/ia32/vsyscall-sysenter.S +++ b/arch/x86_64/ia32/vsyscall-sysenter.S | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <asm/ia32_unistd.h> | 5 | #include <asm/ia32_unistd.h> |
| 6 | #include <asm/offset.h> | 6 | #include <asm/asm-offsets.h> |
| 7 | 7 | ||
| 8 | .text | 8 | .text |
| 9 | .section .text.vsyscall,"ax" | 9 | .section .text.vsyscall,"ax" |