diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /arch/um/sys-i386/stub.S | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/um/sys-i386/stub.S')
| -rw-r--r-- | arch/um/sys-i386/stub.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/stub.S b/arch/um/sys-i386/stub.S index c41b04bf5fa0..54a36ec20cb7 100644 --- a/arch/um/sys-i386/stub.S +++ b/arch/um/sys-i386/stub.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include "as-layout.h" | 1 | #include "as-layout.h" |
| 2 | 2 | ||
| 3 | .globl syscall_stub | 3 | .globl syscall_stub |
| 4 | .section .__syscall_stub, "x" | 4 | .section .__syscall_stub, "ax" |
| 5 | 5 | ||
| 6 | .globl batch_syscall_stub | 6 | .globl batch_syscall_stub |
| 7 | batch_syscall_stub: | 7 | batch_syscall_stub: |