1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 41ebaaf8bb1a..75efea0539c1 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -41,7 +41,8 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
@@ -64,7 +65,7 @@ ACPI_MODULE_NAME("utxfinit")
 *              called, so any early initialization belongs here.
 *
 ******************************************************************************/
-acpi_status acpi_initialize_subsystem(void)
+acpi_status __init acpi_initialize_subsystem(void)
 {
        acpi_status status;
@@ -124,7 +125,8 @@ acpi_status acpi_initialize_subsystem(void)
        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
+ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_subsystem)
 /*******************************************************************************
 *
@@ -138,7 +140,7 @@ ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
 *              Puts system into ACPI mode if it isn't already.
 *
 ******************************************************************************/
-acpi_status acpi_enable_subsystem(u32 flags)
+acpi_status __init acpi_enable_subsystem(u32 flags)
 {
        acpi_status status = AE_OK;
@@ -228,7 +230,8 @@ acpi_status acpi_enable_subsystem(u32 flags)
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
+ACPI_EXPORT_SYMBOL_INIT(acpi_enable_subsystem)
 /*******************************************************************************
 *
@@ -242,7 +245,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
 *              objects and executing AML code for Regions, buffers, etc.
 *
 ******************************************************************************/
-acpi_status acpi_initialize_objects(u32 flags)
+acpi_status __init acpi_initialize_objects(u32 flags)
 {
        acpi_status status = AE_OK;
@@ -314,4 +317,5 @@ acpi_status acpi_initialize_objects(u32 flags)
        acpi_gbl_startup_flags |= ACPI_INITIALIZED_OK;
        return_ACPI_STATUS(status);
 }
-ACPI_EXPORT_SYMBOL(acpi_initialize_objects)
+ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_objects)

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c index 41ebaaf8bb1a..75efea0539c1 100644 --- a/drivers/acpi/acpica/utxfinit.c +++ b/drivers/acpi/acpica/utxfinit.c
@@ -41,7 +41,8 @@
41	* POSSIBILITY OF SUCH DAMAGES.	41	* POSSIBILITY OF SUCH DAMAGES.
42	*/	42	*/
43		43
44	#include <linux/export.h>	44	#define EXPORT_ACPI_INTERFACES
		45
45	#include <acpi/acpi.h>	46	#include <acpi/acpi.h>
46	#include "accommon.h"	47	#include "accommon.h"
47	#include "acevents.h"	48	#include "acevents.h"
@@ -64,7 +65,7 @@ ACPI_MODULE_NAME("utxfinit")
64	* called, so any early initialization belongs here.	65	* called, so any early initialization belongs here.
65	*	66	*
66	******************************************************************************/	67	******************************************************************************/
67	acpi_status acpi_initialize_subsystem(void)	68	acpi_status __init acpi_initialize_subsystem(void)
68	{	69	{
69	acpi_status status;	70	acpi_status status;
70		71
@@ -124,7 +125,8 @@ acpi_status acpi_initialize_subsystem(void)
124	ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());	125	ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
125	return_ACPI_STATUS(status);	126	return_ACPI_STATUS(status);
126	}	127	}
127	ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)	128
		129	ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_subsystem)
128		130
129	/*******************************************************************************	131	/*******************************************************************************
130	*	132	*
@@ -138,7 +140,7 @@ ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)
138	* Puts system into ACPI mode if it isn't already.	140	* Puts system into ACPI mode if it isn't already.
139	*	141	*
140	******************************************************************************/	142	******************************************************************************/
141	acpi_status acpi_enable_subsystem(u32 flags)	143	acpi_status __init acpi_enable_subsystem(u32 flags)
142	{	144	{
143	acpi_status status = AE_OK;	145	acpi_status status = AE_OK;
144		146
@@ -228,7 +230,8 @@ acpi_status acpi_enable_subsystem(u32 flags)
228		230
229	return_ACPI_STATUS(status);	231	return_ACPI_STATUS(status);
230	}	232	}
231	ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)	233
		234	ACPI_EXPORT_SYMBOL_INIT(acpi_enable_subsystem)
232		235
233	/*******************************************************************************	236	/*******************************************************************************
234	*	237	*
@@ -242,7 +245,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)
242	* objects and executing AML code for Regions, buffers, etc.	245	* objects and executing AML code for Regions, buffers, etc.
243	*	246	*
244	******************************************************************************/	247	******************************************************************************/
245	acpi_status acpi_initialize_objects(u32 flags)	248	acpi_status __init acpi_initialize_objects(u32 flags)
246	{	249	{
247	acpi_status status = AE_OK;	250	acpi_status status = AE_OK;
248		251
@@ -314,4 +317,5 @@ acpi_status acpi_initialize_objects(u32 flags)
314	acpi_gbl_startup_flags \|= ACPI_INITIALIZED_OK;	317	acpi_gbl_startup_flags \|= ACPI_INITIALIZED_OK;
315	return_ACPI_STATUS(status);	318	return_ACPI_STATUS(status);
316	}	319	}
317	ACPI_EXPORT_SYMBOL(acpi_initialize_objects)	320
		321	ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_objects)