diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
| commit | 7efb35af738e96565934cc640d863eb18dba0206 (patch) | |
| tree | 29ed331d864b0cfa73fdca5fd3982896e56f9530 /arch/parisc/hpux/gate.S | |
| parent | 748c5151deb56e4b7b5a9b07a884243764933831 (diff) | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/parisc/hpux/gate.S')
| -rw-r--r-- | arch/parisc/hpux/gate.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index 0b9d5b1e4b37..38a1c1b8d4e8 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | .import hpux_call_table | 20 | .import hpux_call_table |
| 21 | .import hpux_syscall_exit,code | 21 | .import hpux_syscall_exit,code |
| 22 | 22 | ||
| 23 | .align 4096 | 23 | .align PAGE_SIZE |
| 24 | ENTRY(hpux_gateway_page) | 24 | ENTRY(hpux_gateway_page) |
| 25 | nop | 25 | nop |
| 26 | #ifdef CONFIG_64BIT | 26 | #ifdef CONFIG_64BIT |
| @@ -103,5 +103,5 @@ syscall_nosys: | |||
| 103 | ldo -ENOSYS(%r0),%r28 | 103 | ldo -ENOSYS(%r0),%r28 |
| 104 | ENDPROC(hpux_gateway_page) | 104 | ENDPROC(hpux_gateway_page) |
| 105 | 105 | ||
| 106 | .align 4096 | 106 | .align PAGE_SIZE |
| 107 | ENTRY(end_hpux_gateway_page) | 107 | ENTRY(end_hpux_gateway_page) |