Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29008
b: refs/heads/master
c: daacf8b
h: refs/heads/master
v: v3
  • Loading branch information
Shaohua Li authored and Linus Torvalds committed Jun 23, 2006
1 parent 6d37c23 commit 2a91d2a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e084dbd3a995f99f5444a9046e66d93c1b92c348
refs/heads/master: daacf8bc0dd37a6ad3a87d1a667599e15940815e
9 changes: 4 additions & 5 deletions trunk/arch/i386/kernel/acpi/wakeup.S
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
movl $0x12345678, saved_magic
ret

.data
ALIGN
ENTRY(saved_magic) .long 0
ENTRY(saved_eip) .long 0

save_registers:
leal 4(%esp), %eax
movl %eax, saved_context_esp
Expand Down Expand Up @@ -304,7 +299,11 @@ ret_point:
call restore_processor_state
ret

.data
ALIGN
ENTRY(saved_magic) .long 0
ENTRY(saved_eip) .long 0

# saved registers
saved_gdt: .long 0,0
saved_idt: .long 0,0
Expand Down

0 comments on commit 2a91d2a

Please sign in to comment.