diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/x86_64/ia32 | |
parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/x86_64/ia32')
-rw-r--r-- | arch/x86_64/ia32/ia32entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index e0eb0c712fe9..df0773c9bdbe 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S | |||
@@ -341,7 +341,7 @@ ENTRY(ia32_ptregs_common) | |||
341 | jmp ia32_sysret /* misbalances the return cache */ | 341 | jmp ia32_sysret /* misbalances the return cache */ |
342 | CFI_ENDPROC | 342 | CFI_ENDPROC |
343 | 343 | ||
344 | .data | 344 | .section .rodata,"a" |
345 | .align 8 | 345 | .align 8 |
346 | .globl ia32_sys_call_table | 346 | .globl ia32_sys_call_table |
347 | ia32_sys_call_table: | 347 | ia32_sys_call_table: |