Deleted Added
full compact
acpi_wakeup.c (333361) acpi_wakeup.c (334152)
1/*-
2 * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2003 Peter Wemm
5 * Copyright (c) 2008-2012 Jung-uk Kim <jkim@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
3 * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
4 * Copyright (c) 2003 Peter Wemm
5 * Copyright (c) 2008-2012 Jung-uk Kim <jkim@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: stable/11/sys/x86/acpica/acpi_wakeup.c 333361 2018-05-08 10:56:06Z kib $");
31__FBSDID("$FreeBSD: stable/11/sys/x86/acpica/acpi_wakeup.c 334152 2018-05-24 13:17:24Z kib $");
32
33#if defined(__amd64__)
34#define DEV_APIC
35#else
36#include "opt_apic.h"
37#endif
38
39#include <sys/param.h>

--- 180 unchanged lines hidden (view full) ---

220#ifdef SMP
221 if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
222 device_printf(sc->acpi_dev, "Failed to suspend APs\n");
223 return (0); /* couldn't sleep */
224 }
225#endif
226#ifdef __amd64__
227 hw_ibrs_active = 0;
32
33#if defined(__amd64__)
34#define DEV_APIC
35#else
36#include "opt_apic.h"
37#endif
38
39#include <sys/param.h>

--- 180 unchanged lines hidden (view full) ---

220#ifdef SMP
221 if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
222 device_printf(sc->acpi_dev, "Failed to suspend APs\n");
223 return (0); /* couldn't sleep */
224 }
225#endif
226#ifdef __amd64__
227 hw_ibrs_active = 0;
228 hw_ssb_active = 0;
228 cpu_stdext_feature3 = 0;
229 CPU_FOREACH(i) {
230 pc = pcpu_find(i);
231 pc->pc_ibpb_set = 0;
232 }
233#endif
234
235 WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));

--- 204 unchanged lines hidden ---
229 cpu_stdext_feature3 = 0;
230 CPU_FOREACH(i) {
231 pc = pcpu_find(i);
232 pc->pc_ibpb_set = 0;
233 }
234#endif
235
236 WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));

--- 204 unchanged lines hidden ---