Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f3f2226 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: suspend: build-fix for CONFIG_SUSPEND=n and CONFIG_HIBERNATION=y 

This fixes compilation with CONFIG_SUSPEND unset and CONFIG_HIBERNATION set
(raf. http://marc.info/?l=linux-acpi&m=119055289723895&w=4

).

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4942de4a

drivers/acpi/sleep/main.c

+21 −21
Original line number Diff line number Diff line
@@ -26,6 +26,27 @@ u8 sleep_states[ACPI_S_STATE_COUNT]; 


static u32 acpi_target_sleep_state = ACPI_STATE_S0;



int acpi_sleep_prepare(u32 acpi_state)

{

#ifdef CONFIG_ACPI_SLEEP

	/* do we have a wakeup address for S2 and S3? */

	if (acpi_state == ACPI_STATE_S3) {

		if (!acpi_wakeup_address) {

			return -EFAULT;

		}

		acpi_set_firmware_waking_vector((acpi_physical_address)

						virt_to_phys((void *)

							     acpi_wakeup_address));



	}

	ACPI_FLUSH_CPU_CACHE();

	acpi_enable_wakeup_device_prep(acpi_state);

#endif

	acpi_gpe_sleep_prepare(acpi_state);

	acpi_enter_sleep_state_prep(acpi_state);

	return 0;

}



#ifdef CONFIG_SUSPEND

static struct pm_ops acpi_pm_ops;
@@ -60,27 +81,6 @@ static int acpi_pm_set_target(suspend_state_t pm_state) 
	return error;

}



int acpi_sleep_prepare(u32 acpi_state)

{

#ifdef CONFIG_ACPI_SLEEP

	/* do we have a wakeup address for S2 and S3? */

	if (acpi_state == ACPI_STATE_S3) {

		if (!acpi_wakeup_address) {

			return -EFAULT;

		}

		acpi_set_firmware_waking_vector((acpi_physical_address)

						virt_to_phys((void *)

							     acpi_wakeup_address));



	}

	ACPI_FLUSH_CPU_CACHE();

	acpi_enable_wakeup_device_prep(acpi_state);

#endif

	acpi_gpe_sleep_prepare(acpi_state);

	acpi_enter_sleep_state_prep(acpi_state);

	return 0;

}



/**

 *	acpi_pm_prepare - Do preliminary suspend work.

 *	@pm_state: ignored