diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-21 03:43:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-21 03:43:55 -0800 |
| commit | 756ee81990fdeb9f662c20296a797dfd44481579 (patch) | |
| tree | 4a7dce3d1f994eb4ff8dd5d2caa611b54957fe4d /include | |
| parent | fcd3bb4b20be2eaf84b9e4db38ff843c72585959 (diff) | |
| parent | c81430b50f55670cd5bef96242021943832e4470 (diff) | |
Merge bk://gkernel.bkbits.net/misc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/calling.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/calling.h b/include/asm-x86_64/calling.h index 7a1b854e9c49..b773861e3d94 100644 --- a/include/asm-x86_64/calling.h +++ b/include/asm-x86_64/calling.h @@ -56,7 +56,7 @@ movq %r10,1*8(%rsp) CFI_REL_OFFSET r10,1*8 movq %r11,(%rsp) - CFI_OFFSET r11 + CFI_REL_OFFSET r11,0*8 .endif .endm |