diff options
| author | Andi Kleen <ak@suse.de> | 2006-10-05 12:47:22 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-10-05 12:47:22 -0400 |
| commit | 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 (patch) | |
| tree | b3bbe80bbcc38f5ee07b6b235f4bf1fd210e5efe | |
| parent | 0a5ace2ab08d45cd78d7ef0067cdcd5c812ac54f (diff) | |
[PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers
Add correct CFI annotation to the backlink on top of the interrupt stack.
Signed-off-by: Andi Kleen <ak@suse.de>
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index ab9b2c4726f2..38a7b2d528e2 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -535,6 +535,8 @@ END(stub_rt_sigreturn) | |||
| 535 | 1: incl %gs:pda_irqcount | 535 | 1: incl %gs:pda_irqcount |
| 536 | cmoveq %gs:pda_irqstackptr,%rsp | 536 | cmoveq %gs:pda_irqstackptr,%rsp |
| 537 | push %rbp # backlink for old unwinder | 537 | push %rbp # backlink for old unwinder |
| 538 | CFI_ADJUST_CFA_OFFSET 8 | ||
| 539 | CFI_REL_OFFSET rbp,0 | ||
| 538 | /* | 540 | /* |
| 539 | * We entered an interrupt context - irqs are off: | 541 | * We entered an interrupt context - irqs are off: |
| 540 | */ | 542 | */ |
| @@ -1174,6 +1176,7 @@ ENTRY(call_softirq) | |||
| 1174 | incl %gs:pda_irqcount | 1176 | incl %gs:pda_irqcount |
| 1175 | cmove %gs:pda_irqstackptr,%rsp | 1177 | cmove %gs:pda_irqstackptr,%rsp |
| 1176 | push %rbp # backlink for old unwinder | 1178 | push %rbp # backlink for old unwinder |
| 1179 | CFI_ADJUST_CFA_OFFSET 8 | ||
| 1177 | call __do_softirq | 1180 | call __do_softirq |
| 1178 | leaveq | 1181 | leaveq |
| 1179 | CFI_DEF_CFA_REGISTER rsp | 1182 | CFI_DEF_CFA_REGISTER rsp |
