Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next (dd87cc53) · Commits · e / devices / android_kernel_teracube_2e

arch/ia64/include/asm/acpi.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void)
		int acpi_request_vector (u32 int_type);
		int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);

		/* routines for saving/restoring kernel state */
		extern int acpi_save_state_mem(void);
		extern void acpi_restore_state_mem(void);
		/* Low-level suspend routine. */
		extern int acpi_suspend_lowlevel(void);

		extern unsigned long acpi_wakeup_address;

		/*

+2 −12

Original line number	Diff line number	Diff line
		@@ -1034,18 +1034,8 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
		EXPORT_SYMBOL(acpi_unregister_ioapic);

		/*
		* acpi_save_state_mem() - save kernel state
		* acpi_suspend_lowlevel() - save kernel state and suspend.
		*
		* TBD when when IA64 starts to support suspend...
		*/
		int acpi_save_state_mem(void) { return 0; }

		/*
		* acpi_restore_state()
		*/
		void acpi_restore_state_mem(void) {}

		/*
		* do_suspend_lowlevel()
		*/
		void do_suspend_lowlevel(void) {}
		int acpi_suspend_lowlevel(void) { return 0; }

+2 −3

Original line number	Diff line number	Diff line
		@@ -112,9 +112,8 @@ static inline void acpi_disable_pci(void)
		acpi_noirq_set();
		}

		/* routines for saving/restoring kernel state */
		extern int acpi_save_state_mem(void);
		extern void acpi_restore_state_mem(void);
		/* Low-level suspend routine. */
		extern int acpi_suspend_lowlevel(void);

		extern unsigned long acpi_wakeup_address;

+3 −10

Original line number	Diff line number	Diff line
		@@ -29,14 +29,14 @@ static char temp_stack[4096];
		#endif

		/**
		* acpi_save_state_mem - save kernel state
		* acpi_suspend_lowlevel - save kernel state
		*
		* Create an identity mapped page table and copy the wakeup routine to
		* low memory.
		*
		* Note that this is too late to change acpi_wakeup_address.
		*/
		int acpi_save_state_mem(void)
		int acpi_suspend_lowlevel(void)
		{
		struct wakeup_header *header;

		@@ -107,17 +107,10 @@ int acpi_save_state_mem(void)
		saved_magic = 0x123456789abcdef0L;
		#endif /* CONFIG_64BIT */

		do_suspend_lowlevel();
		return 0;
		}

		/*
		* acpi_restore_state - undo effects of acpi_save_state_mem
		*/
		void acpi_restore_state_mem(void)
		{
		}


		/**
		* acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
		*

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,5 @@ extern char swsusp_pg_dir[PAGE_SIZE];

		extern unsigned long acpi_copy_wakeup_routine(unsigned long);
		extern void wakeup_long64(void);

		extern void do_suspend_lowlevel(void);