acpi resume related patch

[Ian Smith]

On Fri, 25 Jan 2013 19:45:12 +0200, Andriy Gapon wrote:
 > on 25/01/2013 19:40 Ian Smith said the following:
 > > On Fri, 25 Jan 2013 10:43:56 +0200, Andriy Gapon wrote:
 > > 
 > >  > If you have ACPI suspend/resume working, if it used to work but stopped working
 > >  > at some time, if it never worked, but you are still hoping, could you please
 > >  > test the following patch and report back?
 > >  > 
 > >  > http://svn.freebsd.by/files/acpi-apic-wakeup-final.patch
 > > 
 > > Sort of a negative report: on my Thinkpad T23 (9.1-REL, i386) suspend 
 > > and resume finally work flawlessly every time out of the box, with no 
 > > fudging such as unloading / reloading USB drivers as on 8.2.
 > > 
 > > I always resume it with the Fn key (or lifting lid) but I tried using 
 > > the power button this time, no problem, so no use testing your patch?
 > 
 > Actually, I failed to mention that, but I am trying to check that there are no
 > regressions with the patch.

Having spent the last two full nights up almost completely rebuilding a 
friend's Lenovo SL500 - broken left LCD hinge, design fault, not an 
uncommon problem on these - I'm almost delerious and shouldn't have 
tried this tonight .. but here's the patch results.  Too late to try 
building it tonight anyway (yes these are local times), but it doesn't 
seem to apply happily to 9.1-RELEASE:

=======
Script started on Sat Jan 26 05:07:08 2013

You have mail.
root at t23_4ma:/usr/src # patch <acpi-apic-wakeup-final.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/amd64/amd64/mp_machdep.c
|===================================================================
|--- sys/amd64/amd64/mp_machdep.c	(revision 245694)
|+++ sys/amd64/amd64/mp_machdep.c	(working copy)
--------------------------
Patching file sys/amd64/amd64/mp_machdep.c using Plan A...
Hunk #1 failed at 1431.
1 out of 1 hunks failed--saving rejects to sys/amd64/amd64/mp_machdep.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/dev/acpica/acpi.c
|===================================================================
|--- sys/dev/acpica/acpi.c	(revision 245694)
|+++ sys/dev/acpica/acpi.c	(working copy)
--------------------------
Patching file sys/dev/acpica/acpi.c using Plan A...
Hunk #1 failed at 2659.
Hunk #2 failed at 2744.
2 out of 2 hunks failed--saving rejects to sys/dev/acpica/acpi.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/x86/x86/intr_machdep.c
|===================================================================
|--- sys/x86/x86/intr_machdep.c	(revision 245694)
|+++ sys/x86/x86/intr_machdep.c	(working copy)
--------------------------
Patching file sys/x86/x86/intr_machdep.c using Plan A...
Hunk #1 succeeded at 287.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/x86/x86/local_apic.c
|===================================================================
|--- sys/x86/x86/local_apic.c	(revision 245694)
|+++ sys/x86/x86/local_apic.c	(working copy)
--------------------------
Patching file sys/x86/x86/local_apic.c using Plan A...
Hunk #1 failed at 160.
Hunk #2 succeeded at 167 (offset -4 lines).
Hunk #3 succeeded at 567 (offset -3 lines).
Hunk #4 succeeded at 1351 (offset -11 lines).
1 out of 4 hunks failed--saving rejects to sys/x86/x86/local_apic.c.rej
done
root at t23_4ma:/usr/src # exit
exit

Script done on Sat Jan 26 05:07:41 2013
=======

cheers, Ian