On Tue, Feb 03, 2015 at 03:36:59AM -0700, David Coppa wrote: > > ok? > > Ciao, > David > > Index: arch/amd64/amd64/acpi_wakecode.S > =================================================================== > RCS file: /cvs/src/sys/arch/amd64/amd64/acpi_wakecode.S,v > retrieving revision 1.35 > diff -u -p -u -p -r1.35 acpi_wakecode.S > --- arch/amd64/amd64/acpi_wakecode.S 8 Dec 2014 07:12:37 -0000 1.35 > +++ arch/amd64/amd64/acpi_wakecode.S 3 Feb 2015 10:32:43 -0000 > @@ -627,12 +627,14 @@ _ACPI_TRMP_DATA_LABEL(acpi_saved_sfmask) > .align 4 > _ACPI_TRMP_DATA_LABEL(acpi_pdirpa) > .long 0 > +#ifdef HIBERNATE > _ACPI_TRMP_DATA_LABEL(hibernate_indirect_16) > .long hibernate_resume_vector_3 > .word 0x18 > _ACPI_TRMP_DATA_LABEL(hibernate_indirect_16b) > .long hibernate_resume_vector_3b > .word 0x18 > +#endif /* HIBERNATE */ > > _C_LABEL(acpi_tramp_data_end): > >
I think you'll have other trampoline problems besides this, but if this works for you ... sure, I don't see any problem with it. ok mlarkin@
