git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
syscall.S
diff --git
a/arch/parisc/kernel/syscall.S
b/arch/parisc/kernel/syscall.S
index
af88afe
..
a058004
100644
(file)
--- a/
arch/parisc/kernel/syscall.S
+++ b/
arch/parisc/kernel/syscall.S
@@
-6,7
+6,6
@@
* thanks to Philipp Rumpf, Mike Shaver and various others
* sorry about the wall, puffin..
*/
* thanks to Philipp Rumpf, Mike Shaver and various others
* sorry about the wall, puffin..
*/
-#include <linux/config.h> /* for CONFIG_SMP */
#include <asm/asm-offsets.h>
#include <asm/unistd.h>
#include <asm/asm-offsets.h>
#include <asm/unistd.h>
@@
-29,18
+28,6
@@
.level 1.1
#endif
.level 1.1
#endif
-#ifndef CONFIG_64BIT
- .macro fixup_branch,lbl
- b \lbl
- .endm
-#else
- .macro fixup_branch,lbl
- ldil L%\lbl, %r1
- ldo R%\lbl(%r1), %r1
- bv,n %r0(%r1)
- .endm
-#endif
-
.text
.import syscall_exit,code
.text
.import syscall_exit,code
@@
-55,7
+42,7
@@
* pointers.
*/
* pointers.
*/
- .align
4096
+ .align
ASM_PAGE_SIZE
linux_gateway_page:
/* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */
linux_gateway_page:
/* ADDRESS 0x00 to 0xb0 = 176 bytes / 4 bytes per insn = 44 insns */
@@
-541,7
+528,7
@@
cas_nocontend:
# endif
/* ENABLE_LWS_DEBUG */
# endif
/* ENABLE_LWS_DEBUG */
-
ldcw
0(%sr2,%r20), %r28 /* Try to acquire the lock */
+
LDCW
0(%sr2,%r20), %r28 /* Try to acquire the lock */
cmpb,<>,n %r0, %r28, cas_action /* Did we get it? */
cas_wouldblock:
ldo 2(%r0), %r28 /* 2nd case */
cmpb,<>,n %r0, %r28, cas_action /* Did we get it? */
cas_wouldblock:
ldo 2(%r0), %r28 /* 2nd case */
@@
-632,7
+619,7
@@
cas_action:
end_compare_and_swap:
/* Make sure nothing else is placed on this page */
end_compare_and_swap:
/* Make sure nothing else is placed on this page */
- .align
4096
+ .align
ASM_PAGE_SIZE
.export end_linux_gateway_page
end_linux_gateway_page:
.export end_linux_gateway_page
end_linux_gateway_page:
@@
-652,7
+639,7
@@
end_linux_gateway_page:
.section .rodata,"a"
.section .rodata,"a"
- .align
4096
+ .align
ASM_PAGE_SIZE
/* Light-weight-syscall table */
/* Start of lws table. */
.export lws_table
/* Light-weight-syscall table */
/* Start of lws table. */
.export lws_table
@@
-662,14
+649,14
@@
lws_table:
LWS_ENTRY(compare_and_swap64) /* 1 - ELF64 Atomic compare and swap */
/* End of lws table */
LWS_ENTRY(compare_and_swap64) /* 1 - ELF64 Atomic compare and swap */
/* End of lws table */
- .align
4096
+ .align
ASM_PAGE_SIZE
.export sys_call_table
.Lsys_call_table:
sys_call_table:
#include "syscall_table.S"
#ifdef CONFIG_64BIT
.export sys_call_table
.Lsys_call_table:
sys_call_table:
#include "syscall_table.S"
#ifdef CONFIG_64BIT
- .align
4096
+ .align
ASM_PAGE_SIZE
.export sys_call_table64
.Lsys_call_table64:
sys_call_table64:
.export sys_call_table64
.Lsys_call_table64:
sys_call_table64: