Merge http://jfs.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/acpi/dispatcher/dsfield.c

 /******************************************************************************
  *
  * Module Name: dsfield - Dispatcher field routines
- *              $Revision: 69 $
+ *              $Revision: 70 $
  *
  *****************************************************************************/
 
@@ -242,7 +242,7 @@ acpi_ds_get_field_names (
 			/* Lookup the name */
 
 			status = acpi_ns_lookup (walk_state->scope_info,
-					  (NATIVE_CHAR *) &arg->named.name,
+					  (char *) &arg->named.name,
 					  info->field_type, ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
 					  walk_state, &info->field_node);
 			if (ACPI_FAILURE (status)) {
@@ -409,7 +409,7 @@ acpi_ds_init_field_objects (
 
 		if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) {
 			status = acpi_ns_lookup (walk_state->scope_info,
-					  (NATIVE_CHAR *) &arg->named.name,
+					  (char *) &arg->named.name,
 					  type, ACPI_IMODE_LOAD_PASS1,
 					  ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND,
 					  walk_state, &node);

drivers/acpi/dispatcher/dsmthdat.c

 /*******************************************************************************
  *
  * Module Name: dsmthdat - control method arguments and local variables
- *              $Revision: 67 $
+ *              $Revision: 68 $
  *
  ******************************************************************************/
 

drivers/acpi/dispatcher/dsobject.c

 /******************************************************************************
  *
  * Module Name: dsobject - Dispatcher object management routines
- *              $Revision: 111 $
+ *              $Revision: 112 $
  *
  *****************************************************************************/
 
@@ -187,21 +187,21 @@ acpi_ds_build_internal_buffer_obj (
 	if (obj_desc->buffer.length == 0) {
 		obj_desc->buffer.pointer = NULL;
 		ACPI_REPORT_WARNING (("Buffer created with zero length in AML\n"));
-		return_ACPI_STATUS (AE_OK);
-	}
-
-	obj_desc->buffer.pointer = ACPI_MEM_CALLOCATE (
-			   obj_desc->buffer.length);
-	if (!obj_desc->buffer.pointer) {
-		acpi_ut_delete_object_desc (obj_desc);
-		return_ACPI_STATUS (AE_NO_MEMORY);
 	}
+	else {
+		obj_desc->buffer.pointer = ACPI_MEM_CALLOCATE (
+				   obj_desc->buffer.length);
+		if (!obj_desc->buffer.pointer) {
+			acpi_ut_delete_object_desc (obj_desc);
+			return_ACPI_STATUS (AE_NO_MEMORY);
+		}
 
-	/* Initialize buffer from the Byte_list (if present) */
+		/* Initialize buffer from the Byte_list (if present) */
 
-	if (byte_list) {
-		ACPI_MEMCPY (obj_desc->buffer.pointer, byte_list->named.data,
-				  byte_list_length);
+		if (byte_list) {
+			ACPI_MEMCPY (obj_desc->buffer.pointer, byte_list->named.data,
+					  byte_list_length);
+		}
 	}
 
 	obj_desc->buffer.flags |= AOPOBJ_DATA_VALID;

drivers/acpi/dispatcher/dsutils.c

 /*******************************************************************************
  *
  * Module Name: dsutils - Dispatcher utilities
- *              $Revision: 97 $
+ *              $Revision: 98 $
  *
  ******************************************************************************/
 
@@ -339,7 +339,7 @@ acpi_ds_create_operand (
 	u32                     arg_index)
 {
 	acpi_status             status = AE_OK;
-	NATIVE_CHAR             *name_string;
+	char                    *name_string;
 	u32                     name_length;
 	acpi_operand_object     *obj_desc;
 	acpi_parse_object       *parent_op;

drivers/acpi/dispatcher/dswexec.c

@@ -2,7 +2,7 @@
  *
  * Module Name: dswexec - Dispatcher method execution callbacks;
  *                        dispatch to interpreter.
- *              $Revision: 96 $
+ *              $Revision: 97 $
  *
  *****************************************************************************/
 
@@ -629,6 +629,13 @@ acpi_ds_exec_end_op (
 		acpi_ds_delete_result_if_not_used (op, walk_state->result_obj, walk_state);
 	}
 
+#if _UNDER_DEVELOPMENT
+
+	if (walk_state->parser_state.aml == walk_state->parser_state.aml_end) {
+		acpi_db_method_end (walk_state);
+	}
+#endif
+
 	/* Always clear the object stack */
 
 	walk_state->num_operands = 0;

drivers/acpi/dispatcher/dswload.c

 /******************************************************************************
  *
  * Module Name: dswload - Dispatcher namespace load callbacks
- *              $Revision: 80 $
+ *              $Revision: 82 $
  *
  *****************************************************************************/
 
@@ -108,7 +108,7 @@ acpi_ds_load1_begin_op (
 	acpi_namespace_node     *node;
 	acpi_status             status;
 	acpi_object_type        object_type;
-	NATIVE_CHAR             *path;
+	char                    *path;
 	u32                     flags;
 
 
@@ -423,7 +423,7 @@ acpi_ds_load2_begin_op (
 	acpi_namespace_node     *node;
 	acpi_status             status;
 	acpi_object_type        object_type;
-	NATIVE_CHAR             *buffer_ptr;
+	char                    *buffer_ptr;
 
 
 	ACPI_FUNCTION_TRACE ("Ds_load2_begin_op");
@@ -456,7 +456,7 @@ acpi_ds_load2_begin_op (
 		else {
 			/* Get name from the op */
 
-			buffer_ptr = (NATIVE_CHAR *) &op->named.name;
+			buffer_ptr = (char *) &op->named.name;
 		}
 	}
 	else {

drivers/acpi/dispatcher/dswstate.c

 /******************************************************************************
  *
  * Module Name: dswstate - Dispatcher parse tree walk management routines
- *              $Revision: 71 $
+ *              $Revision: 73 $
  *
  *****************************************************************************/
 
@@ -719,7 +719,7 @@ acpi_ds_get_current_walk_state (
 		return (NULL);
 	}
 
-	ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Ds_get_current_walk_state, =%p\n",
+	ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "Current Walk_state %p\n",
 		thread->walk_state_list));
 
 	return (thread->walk_state_list);

drivers/acpi/events/evgpe.c

 /******************************************************************************
  *
  * Module Name: evgpe - General Purpose Event handling and dispatch
- *              $Revision: 1 $
+ *              $Revision: 3 $
  *
  *****************************************************************************/
 
@@ -92,14 +92,14 @@ acpi_ev_gpe_initialize (void)
 	 * If EITHER the register length OR the block address are zero, then that
 	 * particular block is not supported.
 	 */
-	if (acpi_gbl_FADT->Xgpe0_blk.register_bit_width && ACPI_GET_ADDRESS (acpi_gbl_FADT->Xgpe0_blk.address)) {
+	if (acpi_gbl_FADT->Xgpe0_blk.register_bit_width && acpi_gbl_FADT->Xgpe0_blk.address) {
 		/* GPE block 0 exists (has both length and address > 0) */
 
 		acpi_gbl_gpe_block_info[0].register_count = (u16) (acpi_gbl_FADT->Xgpe0_blk.register_bit_width / (ACPI_GPE_REGISTER_WIDTH * 2));
 		acpi_gbl_gpe_number_max               = (acpi_gbl_gpe_block_info[0].register_count * ACPI_GPE_REGISTER_WIDTH) - 1;
 	}
 
-	if (acpi_gbl_FADT->Xgpe1_blk.register_bit_width && ACPI_GET_ADDRESS (acpi_gbl_FADT->Xgpe1_blk.address)) {
+	if (acpi_gbl_FADT->Xgpe1_blk.register_bit_width && acpi_gbl_FADT->Xgpe1_blk.address) {
 		/* GPE block 1 exists (has both length and address > 0) */
 
 		acpi_gbl_gpe_block_info[1].register_count = (u16) (acpi_gbl_FADT->Xgpe1_blk.register_bit_width / (ACPI_GPE_REGISTER_WIDTH * 2));
@@ -205,11 +205,11 @@ acpi_ev_gpe_initialize (void)
 					   + (i * ACPI_GPE_REGISTER_WIDTH));
 
 			ACPI_STORE_ADDRESS (gpe_register_info->status_address.address,
-					   (ACPI_GET_ADDRESS (acpi_gbl_gpe_block_info[gpe_block].block_address->address)
+					   (acpi_gbl_gpe_block_info[gpe_block].block_address->address
 							  + i));
 
 			ACPI_STORE_ADDRESS (gpe_register_info->enable_address.address,
-					   (ACPI_GET_ADDRESS (acpi_gbl_gpe_block_info[gpe_block].block_address->address)
+					   (acpi_gbl_gpe_block_info[gpe_block].block_address->address
 							  + i
 							  + acpi_gbl_gpe_block_info[gpe_block].register_count));
 
@@ -253,8 +253,8 @@ acpi_ev_gpe_initialize (void)
 
 			ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "GPE Block%d: %X registers at %8.8X%8.8X\n",
 				(s32) gpe_block, acpi_gbl_gpe_block_info[0].register_count,
-				ACPI_HIDWORD (ACPI_GET_ADDRESS (acpi_gbl_gpe_block_info[gpe_block].block_address->address)),
-				ACPI_LODWORD (ACPI_GET_ADDRESS (acpi_gbl_gpe_block_info[gpe_block].block_address->address))));
+				ACPI_HIDWORD (acpi_gbl_gpe_block_info[gpe_block].block_address->address),
+				ACPI_LODWORD (acpi_gbl_gpe_block_info[gpe_block].block_address->address)));
 
 			ACPI_REPORT_INFO (("GPE Block%d defined as GPE%d to GPE%d\n",
 				(s32) gpe_block,
@@ -309,7 +309,7 @@ acpi_ev_save_method_info (
 {
 	u32                     gpe_number;
 	u32                     gpe_number_index;
-	NATIVE_CHAR             name[ACPI_NAME_SIZE + 1];
+	char                    name[ACPI_NAME_SIZE + 1];
 	u8                      type;
 	acpi_status             status;
 
@@ -476,8 +476,8 @@ acpi_ev_gpe_detect (void)
 
 		ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
 			"GPE block at %8.8X%8.8X - Values: Enable %02X Status %02X\n",
-			ACPI_HIDWORD (ACPI_GET_ADDRESS (gpe_register_info->enable_address.address)),
-			ACPI_LODWORD (ACPI_GET_ADDRESS (gpe_register_info->enable_address.address)),
+			ACPI_HIDWORD (gpe_register_info->enable_address.address),
+			ACPI_LODWORD (gpe_register_info->enable_address.address),
 			gpe_register_info->enable,
 			gpe_register_info->status));
 

drivers/acpi/events/evmisc.c

 /******************************************************************************
  *
  * Module Name: evmisc - Miscellaneous event manager support functions
- *              $Revision: 59 $
+ *              $Revision: 60 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exconvrt.c

 /******************************************************************************
  *
  * Module Name: exconvrt - Object conversion routines
- *              $Revision: 45 $
+ *              $Revision: 47 $
  *
  *****************************************************************************/
 
@@ -274,6 +274,7 @@ acpi_ex_convert_to_buffer (
  * PARAMETERS:  Integer         - Value to be converted
  *              Base            - 10 or 16
  *              String          - Where the string is returned
+ *              Data_width      - Size of data item to be converted
  *
  * RETURN:      Actual string length
  *
@@ -285,7 +286,8 @@ u32
 acpi_ex_convert_to_ascii (
 	acpi_integer            integer,
 	u32                     base,
-	u8                      *string)
+	u8                      *string,
+	u8                      data_width)
 {
 	u32                     i;
 	u32                     j;
@@ -293,12 +295,21 @@ acpi_ex_convert_to_ascii (
 	char                    hex_digit;
 	acpi_integer            digit;
 	u32                     remainder;
-	u32                     length = sizeof (acpi_integer);
-	u8                      leading_zero = TRUE;
+	u32                     length;
+	u8                      leading_zero;
 
 
 	ACPI_FUNCTION_ENTRY ();
 
+	if (data_width < sizeof (acpi_integer)) {
+		leading_zero = FALSE;
+		length = data_width;
+	}
+	else {
+		leading_zero = TRUE;
+		length = sizeof (acpi_integer);
+	}
+
 
 	switch (base) {
 	case 10:
@@ -357,8 +368,8 @@ acpi_ex_convert_to_ascii (
 		string [0] = ACPI_ASCII_ZERO;
 		k = 1;
 	}
-	string [k] = 0;
 
+	string [k] = 0;
 	return (k);
 }
 
@@ -437,7 +448,7 @@ acpi_ex_convert_to_string (
 
 		/* Convert */
 
-		i = acpi_ex_convert_to_ascii (obj_desc->integer.value, base, new_buf);
+		i = acpi_ex_convert_to_ascii (obj_desc->integer.value, base, new_buf, sizeof (acpi_integer));
 
 		/* Null terminate at the correct place */
 
@@ -495,7 +506,7 @@ acpi_ex_convert_to_string (
 		pointer = obj_desc->buffer.pointer;
 		index = 0;
 		for (i = 0, index = 0; i < obj_desc->buffer.length; i++) {
-			index = acpi_ex_convert_to_ascii ((acpi_integer) pointer[i], base, &new_buf[index]);
+			index += acpi_ex_convert_to_ascii ((acpi_integer) pointer[i], base, &new_buf[index], 1);
 
 			new_buf[index] = ' ';
 			index++;

drivers/acpi/executer/excreate.c

 /******************************************************************************
  *
  * Module Name: excreate - Named object creation
- *              $Revision: 97 $
+ *              $Revision: 98 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exdump.c

 /******************************************************************************
  *
  * Module Name: exdump - Interpreter debug output routines
- *              $Revision: 163 $
+ *              $Revision: 164 $
  *
  *****************************************************************************/
 
@@ -386,10 +386,10 @@ void
 acpi_ex_dump_operands (
 	acpi_operand_object     **operands,
 	acpi_interpreter_mode   interpreter_mode,
-	NATIVE_CHAR             *ident,
+	char                    *ident,
 	u32                     num_levels,
-	NATIVE_CHAR             *note,
-	NATIVE_CHAR             *module_name,
+	char                    *note,
+	char                    *module_name,
 	u32                     line_number)
 {
 	NATIVE_UINT             i;

drivers/acpi/executer/exfield.c

 /******************************************************************************
  *
  * Module Name: exfield - ACPI AML (p-code) execution - field manipulation
- *              $Revision: 116 $
+ *              $Revision: 117 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exfldio.c

 /******************************************************************************
  *
  * Module Name: exfldio - Aml Field I/O
- *              $Revision: 90 $
+ *              $Revision: 91 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exmisc.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
- *              $Revision: 113 $
+ *              $Revision: 114 $
  *
  *****************************************************************************/
 
@@ -225,7 +225,7 @@ acpi_ex_do_concatenate (
 	u32                     i;
 	acpi_integer            this_integer;
 	acpi_operand_object     *return_desc;
-	NATIVE_CHAR             *new_buf;
+	char                    *new_buf;
 
 
 	ACPI_FUNCTION_ENTRY ();
@@ -249,13 +249,13 @@ acpi_ex_do_concatenate (
 			return (AE_NO_MEMORY);
 		}
 
-		new_buf = (NATIVE_CHAR *) return_desc->buffer.pointer;
+		new_buf = (char *) return_desc->buffer.pointer;
 
 		/* Convert the first integer */
 
 		this_integer = obj_desc1->integer.value;
 		for (i = 0; i < acpi_gbl_integer_byte_width; i++) {
-			new_buf[i] = (NATIVE_CHAR) this_integer;
+			new_buf[i] = (char) this_integer;
 			this_integer >>= 8;
 		}
 
@@ -263,7 +263,7 @@ acpi_ex_do_concatenate (
 
 		this_integer = obj_desc2->integer.value;
 		for (; i < (ACPI_MUL_2 (acpi_gbl_integer_byte_width)); i++) {
-			new_buf[i] = (NATIVE_CHAR) this_integer;
+			new_buf[i] = (char) this_integer;
 			this_integer >>= 8;
 		}
 
@@ -315,7 +315,7 @@ acpi_ex_do_concatenate (
 			return (AE_NO_MEMORY);
 		}
 
-		new_buf = (NATIVE_CHAR *) return_desc->buffer.pointer;
+		new_buf = (char *) return_desc->buffer.pointer;
 
 		/* Concatenate the buffers */
 

drivers/acpi/executer/exmutex.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exmutex - ASL Mutex Acquire/Release functions
- *              $Revision: 16 $
+ *              $Revision: 17 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exnames.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
- *              $Revision: 92 $
+ *              $Revision: 93 $
  *
  *****************************************************************************/
 
@@ -57,13 +57,13 @@
  *
  ******************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ex_allocate_name_string (
 	u32                     prefix_count,
 	u32                     num_name_segs)
 {
-	NATIVE_CHAR             *temp_ptr;
-	NATIVE_CHAR             *name_string;
+	char                    *temp_ptr;
+	char                    *name_string;
 	u32                      size_needed;
 
 	ACPI_FUNCTION_TRACE ("Ex_allocate_name_string");
@@ -145,7 +145,7 @@ acpi_ex_allocate_name_string (
 acpi_status
 acpi_ex_name_segment (
 	u8                      **in_aml_address,
-	NATIVE_CHAR             *name_string)
+	char                    *name_string)
 {
 	char                    *aml_address = (void *) *in_aml_address;
 	acpi_status             status = AE_OK;
@@ -233,12 +233,12 @@ acpi_status
 acpi_ex_get_name_string (
 	acpi_object_type        data_type,
 	u8                      *in_aml_address,
-	NATIVE_CHAR             **out_name_string,
+	char                    **out_name_string,
 	u32                     *out_name_length)
 {
 	acpi_status             status = AE_OK;
 	u8                      *aml_address = in_aml_address;
-	NATIVE_CHAR             *name_string = NULL;
+	char                    *name_string = NULL;
 	u32                     num_segments;
 	u32                     prefix_count = 0;
 	u8                      has_prefix = FALSE;

drivers/acpi/executer/exoparg2.c

 /******************************************************************************
  *
  * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
- *              $Revision: 115 $
+ *              $Revision: 116 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exresolv.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exresolv - AML Interpreter object resolution
- *              $Revision: 117 $
+ *              $Revision: 118 $
  *
  *****************************************************************************/
 

drivers/acpi/executer/exstoren.c

@@ -3,7 +3,7 @@
  *
  * Module Name: exstoren - AML Interpreter object store support,
  *                        Store to Node (namespace object)
- *              $Revision: 52 $
+ *              $Revision: 54 $
  *
  *****************************************************************************/
 
@@ -181,7 +181,7 @@ acpi_ex_store_object_to_object (
 	acpi_status             status = AE_OK;
 
 
-	ACPI_FUNCTION_TRACE_PTR ("Acpi_ex_store_object_to_object", source_desc);
+	ACPI_FUNCTION_TRACE_PTR ("Ex_store_object_to_object", source_desc);
 
 
 	actual_src_desc = source_desc;

drivers/acpi/executer/exstorob.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exstorob - AML Interpreter object store support, store to object
- *              $Revision: 47 $
+ *              $Revision: 49 $
  *
  *****************************************************************************/
 
@@ -55,7 +55,7 @@ acpi_ex_store_buffer_to_buffer (
 	u8                      *buffer;
 
 
-	ACPI_FUNCTION_NAME ("Ex_store_buffer_to_buffer");
+	ACPI_FUNCTION_TRACE_PTR ("Ex_store_buffer_to_buffer", source_desc);
 
 
 	/*
@@ -72,7 +72,7 @@ acpi_ex_store_buffer_to_buffer (
 		(target_desc->common.flags & AOPOBJ_STATIC_POINTER)) {
 		target_desc->buffer.pointer = ACPI_MEM_ALLOCATE (length);
 		if (!target_desc->buffer.pointer) {
-			return (AE_NO_MEMORY);
+			return_ACPI_STATUS (AE_NO_MEMORY);
 		}
 
 		target_desc->common.flags &= ~AOPOBJ_STATIC_POINTER;
@@ -103,7 +103,7 @@ acpi_ex_store_buffer_to_buffer (
 	/* Copy flags */
 
 	target_desc->buffer.flags = source_desc->buffer.flags;
-	return (AE_OK);
+	return_ACPI_STATUS (AE_OK);
 }
 
 
@@ -129,7 +129,7 @@ acpi_ex_store_string_to_string (
 	u8                      *buffer;
 
 
-	ACPI_FUNCTION_ENTRY ();
+	ACPI_FUNCTION_TRACE_PTR ("Ex_store_string_to_string", source_desc);
 
 
 	/*
@@ -166,7 +166,7 @@ acpi_ex_store_string_to_string (
 
 		target_desc->string.pointer = ACPI_MEM_CALLOCATE ((ACPI_SIZE) length + 1);
 		if (!target_desc->string.pointer) {
-			return (AE_NO_MEMORY);
+			return_ACPI_STATUS (AE_NO_MEMORY);
 		}
 
 		target_desc->common.flags &= ~AOPOBJ_STATIC_POINTER;
@@ -176,7 +176,7 @@ acpi_ex_store_string_to_string (
 	/* Set the new target length */
 
 	target_desc->string.length = length;
-	return (AE_OK);
+	return_ACPI_STATUS (AE_OK);
 }
 
 

drivers/acpi/executer/exutils.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exutils - interpreter/scanner utilities
- *              $Revision: 106 $
+ *              $Revision: 107 $
  *
  *****************************************************************************/
 
@@ -298,7 +298,7 @@ acpi_ex_digits_needed (
 void
 acpi_ex_eisa_id_to_string (
 	u32                     numeric_id,
-	NATIVE_CHAR             *out_string)
+	char                    *out_string)
 {
 	u32                     eisa_id;
 
@@ -335,7 +335,7 @@ acpi_ex_eisa_id_to_string (
 void
 acpi_ex_unsigned_integer_to_string (
 	acpi_integer            value,
-	NATIVE_CHAR             *out_string)
+	char                    *out_string)
 {
 	u32                     count;
 	u32                     digits_needed;
@@ -351,7 +351,7 @@ acpi_ex_unsigned_integer_to_string (
 
 	for (count = digits_needed; count > 0; count--) {
 		(void) acpi_ut_short_divide (&value, 10, &quotient, &remainder);
-		out_string[count-1] = (NATIVE_CHAR) ('0' + remainder);\
+		out_string[count-1] = (char) ('0' + remainder);\
 		value = quotient;
 	}
 }

drivers/acpi/hardware/hwacpi.c

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
- *              $Revision: 60 $
+ *              $Revision: 61 $
  *
  *****************************************************************************/
 

drivers/acpi/hardware/hwregs.c

@@ -3,7 +3,7 @@
  *
  * Module Name: hwregs - Read/write access functions for the various ACPI
  *                       control and status registers.
- *              $Revision: 137 $
+ *              $Revision: 138 $
  *
  ******************************************************************************/
 
@@ -58,7 +58,7 @@ acpi_hw_clear_acpi_status (void)
 
 	ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %04X\n",
 		ACPI_BITMASK_ALL_FIXED_STATUS,
-		(u16) ACPI_GET_ADDRESS (acpi_gbl_FADT->Xpm1a_evt_blk.address)));
+		(u16) acpi_gbl_FADT->Xpm1a_evt_blk.address));
 
 
 	status = acpi_ut_acquire_mutex (ACPI_MTX_HARDWARE);
@@ -74,7 +74,7 @@ acpi_hw_clear_acpi_status (void)
 
 	/* Clear the fixed events */
 
-	if (ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xpm1b_evt_blk.address)) {
+	if (acpi_gbl_FADT->Xpm1b_evt_blk.address) {
 		status = acpi_hw_low_level_write (16, ACPI_BITMASK_ALL_FIXED_STATUS,
 				 &acpi_gbl_FADT->Xpm1b_evt_blk, 0);
 		if (ACPI_FAILURE (status)) {
@@ -139,7 +139,7 @@ acpi_get_sleep_type_data (
 	/*
 	 * Evaluate the namespace object containing the values for this state
 	 */
-	status = acpi_ns_evaluate_by_name ((NATIVE_CHAR *) acpi_gbl_db_sleep_states[sleep_state],
+	status = acpi_ns_evaluate_by_name ((char *) acpi_gbl_db_sleep_states[sleep_state],
 			  NULL, &obj_desc);
 	if (ACPI_FAILURE (status)) {
 		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s while evaluating Sleep_state [%s]\n",
@@ -403,16 +403,16 @@ acpi_set_register (
 
 		ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM2 control: Read %X from %8.8X%8.8X\n",
 			register_value,
-			ACPI_HIDWORD (ACPI_GET_ADDRESS (acpi_gbl_FADT->Xpm2_cnt_blk.address)),
-			ACPI_LODWORD (ACPI_GET_ADDRESS (acpi_gbl_FADT->Xpm2_cnt_blk.address))));
+			ACPI_HIDWORD (acpi_gbl_FADT->Xpm2_cnt_blk.address),
+			ACPI_LODWORD (acpi_gbl_FADT->Xpm2_cnt_blk.address)));
 
 		ACPI_REGISTER_INSERT_VALUE (register_value, bit_reg_info->bit_position,
 				bit_reg_info->access_bit_mask, value);
 
 		ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %4.4X to %8.8X%8.8X\n",
 			register_value,
-			ACPI_HIDWORD (ACPI_GET_ADDRESS (acpi_gbl_FADT->Xpm2_cnt_blk.address)),
-			ACPI_LODWORD (ACPI_GET_ADDRESS (acpi_gbl_FADT->Xpm2_cnt_blk.address))));
+			ACPI_HIDWORD (acpi_gbl_FADT->Xpm2_cnt_blk.address),
+			ACPI_LODWORD (acpi_gbl_FADT->Xpm2_cnt_blk.address)));
 
 		status = acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
 				   ACPI_REGISTER_PM2_CONTROL, (u8) (register_value));
@@ -700,7 +700,7 @@ acpi_hw_low_level_read (
 	 * because the PM1A/B code must not fail if B isn't present.
 	 */
 	if ((!reg) ||
-		(!ACPI_VALID_ADDRESS (reg->address))) {
+		(!reg->address)) {
 		return (AE_OK);
 	}
 	*value = 0;
@@ -712,7 +712,7 @@ acpi_hw_low_level_read (
 	switch (reg->address_space_id) {
 	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
-		mem_address = (ACPI_GET_ADDRESS (reg->address)
+		mem_address = (reg->address
 				  + (ACPI_PHYSICAL_ADDRESS) offset);
 
 		status = acpi_os_read_memory (mem_address, value, width);
@@ -721,7 +721,7 @@ acpi_hw_low_level_read (
 
 	case ACPI_ADR_SPACE_SYSTEM_IO:
 
-		io_address = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (reg->address)
+		io_address = (ACPI_IO_ADDRESS) (reg->address
 				   + (ACPI_PHYSICAL_ADDRESS) offset);
 
 		status = acpi_os_read_port (io_address, value, width);
@@ -732,9 +732,9 @@ acpi_hw_low_level_read (
 
 		pci_id.segment = 0;
 		pci_id.bus     = 0;
-		pci_id.device  = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (reg->address));
-		pci_id.function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (reg->address));
-		pci_register   = (u16) (ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (reg->address))
+		pci_id.device  = ACPI_PCI_DEVICE (reg->address);
+		pci_id.function = ACPI_PCI_FUNCTION (reg->address);
+		pci_register   = (u16) (ACPI_PCI_REGISTER (reg->address)
 				  + offset);
 
 		status = acpi_os_read_pci_configuration (&pci_id, pci_register, value, width);
@@ -790,7 +790,7 @@ acpi_hw_low_level_write (
 	 * because the PM1A/B code must not fail if B isn't present.
 	 */
 	if ((!reg) ||
-		(!ACPI_VALID_ADDRESS (reg->address))) {
+		(!reg->address)) {
 		return (AE_OK);
 	}
 	/*
@@ -800,7 +800,7 @@ acpi_hw_low_level_write (
 	switch (reg->address_space_id) {
 	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
-		mem_address = (ACPI_GET_ADDRESS (reg->address)
+		mem_address = (reg->address
 				  + (ACPI_PHYSICAL_ADDRESS) offset);
 
 		status = acpi_os_write_memory (mem_address, (acpi_integer) value, width);
@@ -809,7 +809,7 @@ acpi_hw_low_level_write (
 
 	case ACPI_ADR_SPACE_SYSTEM_IO:
 
-		io_address = (ACPI_IO_ADDRESS) (ACPI_GET_ADDRESS (reg->address)
+		io_address = (ACPI_IO_ADDRESS) (reg->address
 				   + (ACPI_PHYSICAL_ADDRESS) offset);
 
 		status = acpi_os_write_port (io_address, (acpi_integer) value, width);
@@ -820,9 +820,9 @@ acpi_hw_low_level_write (
 
 		pci_id.segment = 0;
 		pci_id.bus     = 0;
-		pci_id.device  = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (reg->address));
-		pci_id.function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (reg->address));
-		pci_register   = (u16) (ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (reg->address))
+		pci_id.device  = ACPI_PCI_DEVICE (reg->address);
+		pci_id.function = ACPI_PCI_FUNCTION (reg->address);
+		pci_register   = (u16) (ACPI_PCI_REGISTER (reg->address)
 				  + offset);
 
 		status = acpi_os_write_pci_configuration (&pci_id, pci_register, (acpi_integer) value, width);

drivers/acpi/include/acconfig.h

 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 122 $
+ *       $Revision: 123 $
  *
  *****************************************************************************/
 
@@ -54,7 +54,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION                 0x20021205
+#define ACPI_CA_VERSION                 0x20021212
 
 /* Version of ACPI supported */
 

drivers/acpi/include/acdebug.h

 /******************************************************************************
  *
  * Name: acdebug.h - ACPI/AML debugger
- *       $Revision: 64 $
+ *       $Revision: 65 $
  *
  *****************************************************************************/
 
@@ -31,7 +31,7 @@
 
 typedef struct command_info
 {
-	NATIVE_CHAR             *name;          /* Command Name */
+	char                    *name;          /* Command Name */
 	u8                      min_args;       /* Minimum arguments required */
 
 } COMMAND_INFO;
@@ -39,7 +39,7 @@ typedef struct command_info
 
 typedef struct argument_info
 {
-	NATIVE_CHAR             *name;          /* Argument Name */
+	char                    *name;          /* Argument Name */
 
 } ARGUMENT_INFO;
 
@@ -83,16 +83,16 @@ acpi_db_single_step (
 
 void
 acpi_db_display_table_info (
-	NATIVE_CHAR             *table_arg);
+	char                    *table_arg);
 
 void
 acpi_db_unload_acpi_table (
-	NATIVE_CHAR             *table_arg,
-	NATIVE_CHAR             *instance_arg);
+	char                    *table_arg,
+	char                    *instance_arg);
 
 void
 acpi_db_set_method_breakpoint (
-	NATIVE_CHAR             *location,
+	char                    *location,
 	acpi_walk_state         *walk_state,
 	acpi_parse_object       *op);
 
@@ -102,46 +102,46 @@ acpi_db_set_method_call_breakpoint (
 
 void
 acpi_db_disassemble_aml (
-	NATIVE_CHAR             *statements,
+	char                    *statements,
 	acpi_parse_object       *op);
 
 void
 acpi_db_dump_namespace (
-	NATIVE_CHAR             *start_arg,
-	NATIVE_CHAR             *depth_arg);
+	char                    *start_arg,
+	char                    *depth_arg);
 
 void
 acpi_db_dump_namespace_by_owner (
-	NATIVE_CHAR             *owner_arg,
-	NATIVE_CHAR             *depth_arg);
+	char                    *owner_arg,
+	char                    *depth_arg);
 
 void
 acpi_db_send_notify (
-	NATIVE_CHAR             *name,
+	char                    *name,
 	u32                     value);
 
 void
 acpi_db_set_method_data (
-	NATIVE_CHAR             *type_arg,
-	NATIVE_CHAR             *index_arg,
-	NATIVE_CHAR             *value_arg);
+	char                    *type_arg,
+	char                    *index_arg,
+	char                    *value_arg);
 
 acpi_status
 acpi_db_display_objects (
-	NATIVE_CHAR             *obj_type_arg,
-	NATIVE_CHAR             *display_count_arg);
+	char                    *obj_type_arg,
+	char                    *display_count_arg);
 
 acpi_status
 acpi_db_find_name_in_namespace (
-	NATIVE_CHAR             *name_arg);
+	char                    *name_arg);
 
 void
 acpi_db_set_scope (
-	NATIVE_CHAR             *name);
+	char                    *name);
 
 void
 acpi_db_find_references (
-	NATIVE_CHAR             *object_arg);
+	char                    *object_arg);
 
 void
 acpi_db_display_locks (void);
@@ -149,7 +149,7 @@ acpi_db_display_locks (void);
 
 void
 acpi_db_display_resources (
-	NATIVE_CHAR             *object_arg);
+	char                    *object_arg);
 
 void
 acpi_db_check_integrity (
@@ -194,8 +194,8 @@ acpi_db_display_method_info (
 
 void
 acpi_db_decode_and_display_object (
-	NATIVE_CHAR             *target,
-	NATIVE_CHAR             *output_type);
+	char                    *target,
+	char                    *output_type);
 
 void
 acpi_db_decode_node (
@@ -208,7 +208,7 @@ acpi_db_display_result_object (
 
 acpi_status
 acpi_db_display_all_methods (
-	NATIVE_CHAR             *display_count_arg);
+	char                    *display_count_arg);
 
 void
 acpi_db_display_internal_object (
@@ -255,15 +255,15 @@ acpi_db_decode_internal_object (
 
 void
 acpi_db_execute (
-	NATIVE_CHAR             *name,
-	NATIVE_CHAR             **args,
+	char                    *name,
+	char                    **args,
 	u32                     flags);
 
 void
 acpi_db_create_execution_threads (
-	NATIVE_CHAR             *num_threads_arg,
-	NATIVE_CHAR             *num_loops_arg,
-	NATIVE_CHAR             *method_name_arg);
+	char                    *num_threads_arg,
+	char                    *num_loops_arg,
+	char                    *method_name_arg);
 
 acpi_status
 acpi_db_execute_method (
@@ -289,7 +289,7 @@ acpi_db_method_thread (
 
 acpi_object_type
 acpi_db_match_argument (
-	NATIVE_CHAR             *user_argument,
+	char                    *user_argument,
 	ARGUMENT_INFO           *arguments);
 
 acpi_status
@@ -302,15 +302,15 @@ acpi_db_close_debug_file (
 
 void
 acpi_db_open_debug_file (
-	NATIVE_CHAR             *name);
+	char                    *name);
 
 acpi_status
 acpi_db_load_acpi_table (
-	NATIVE_CHAR             *filename);
+	char                    *filename);
 
 acpi_status
 acpi_db_get_acpi_table (
-	NATIVE_CHAR             *filename);
+	char                    *filename);
 
 /*
  * dbhistry - debugger HISTORY command
@@ -318,14 +318,14 @@ acpi_db_get_acpi_table (
 
 void
 acpi_db_add_to_history (
-	NATIVE_CHAR             *command_line);
+	char                    *command_line);
 
 void
 acpi_db_display_history (void);
 
-NATIVE_CHAR *
+char *
 acpi_db_get_from_history (
-	NATIVE_CHAR             *command_num_arg);
+	char                    *command_num_arg);
 
 
 /*
@@ -334,7 +334,7 @@ acpi_db_get_from_history (
 
 acpi_status
 acpi_db_command_dispatch (
-	NATIVE_CHAR             *input_buffer,
+	char                    *input_buffer,
 	acpi_walk_state         *walk_state,
 	acpi_parse_object       *op);
 
@@ -344,25 +344,25 @@ acpi_db_execute_thread (
 
 acpi_status
 acpi_db_user_commands (
-	NATIVE_CHAR             prompt,
+	char                    prompt,
 	acpi_parse_object       *op);
 
 void
 acpi_db_display_help (
-	NATIVE_CHAR             *help_type);
+	char                    *help_type);
 
-NATIVE_CHAR *
+char *
 acpi_db_get_next_token (
-	NATIVE_CHAR             *string,
-	NATIVE_CHAR             **next);
+	char                    *string,
+	char                    **next);
 
 u32
 acpi_db_get_line (
-	NATIVE_CHAR             *input_buffer);
+	char                    *input_buffer);
 
 u32
 acpi_db_match_command (
-	NATIVE_CHAR             *user_command);
+	char                    *user_command);
 
 void
 acpi_db_single_thread (
@@ -381,7 +381,7 @@ acpi_db_generate_statistics (
 
 acpi_status
 acpi_db_display_statistics (
-	NATIVE_CHAR             *type_arg);
+	char                    *type_arg);
 
 acpi_status
 acpi_db_classify_one_object (
@@ -418,7 +418,7 @@ acpi_db_dump_object (
 
 void
 acpi_db_prep_namestring (
-	NATIVE_CHAR             *name);
+	char                    *name);
 
 
 acpi_status
@@ -427,7 +427,7 @@ acpi_db_second_pass_parse (
 
 acpi_namespace_node *
 acpi_db_local_ns_lookup (
-	NATIVE_CHAR             *name);
+	char                    *name);
 
 
 #endif  /* __ACDEBUG_H__ */

drivers/acpi/include/acexcep.h

 /******************************************************************************
  *
  * Name: acexcep.h - Exception codes returned by the ACPI subsystem
- *       $Revision: 65 $
+ *       $Revision: 66 $
  *
  *****************************************************************************/
 
@@ -171,7 +171,7 @@
  * String versions of the exception codes above
  * These strings must match the corresponding defines exactly
  */
-NATIVE_CHAR const   *acpi_gbl_exception_names_env[] =
+char const   *acpi_gbl_exception_names_env[] =
 {
 	"AE_OK",
 	"AE_ERROR",
@@ -204,7 +204,7 @@ NATIVE_CHAR const   *acpi_gbl_exception_names_env[] =
 	"AE_ABORT_METHOD"
 };
 
-NATIVE_CHAR const   *acpi_gbl_exception_names_pgm[] =
+char const   *acpi_gbl_exception_names_pgm[] =
 {
 	"AE_BAD_PARAMETER",
 	"AE_BAD_CHARACTER",
@@ -217,7 +217,7 @@ NATIVE_CHAR const   *acpi_gbl_exception_names_pgm[] =
 	"AE_BAD_DECIMAL_CONSTANT"
 };
 
-NATIVE_CHAR const   *acpi_gbl_exception_names_tbl[] =
+char const   *acpi_gbl_exception_names_tbl[] =
 {
 	"AE_BAD_SIGNATURE",
 	"AE_BAD_HEADER",
@@ -227,7 +227,7 @@ NATIVE_CHAR const   *acpi_gbl_exception_names_tbl[] =
 	"AE_INVALID_TABLE_LENGTH"
 };
 
-NATIVE_CHAR const   *acpi_gbl_exception_names_aml[] =
+char const   *acpi_gbl_exception_names_aml[] =
 {
 	"AE_AML_ERROR",
 	"AE_AML_PARSE",
@@ -263,7 +263,7 @@ NATIVE_CHAR const   *acpi_gbl_exception_names_aml[] =
 	"AE_AML_CIRCULAR_REFERENCE"
 };
 
-NATIVE_CHAR const   *acpi_gbl_exception_names_ctrl[] =
+char const   *acpi_gbl_exception_names_ctrl[] =
 {
 	"AE_CTRL_RETURN_VALUE",
 	"AE_CTRL_PENDING",

drivers/acpi/include/acglobal.h

 /******************************************************************************
  *
  * Name: acglobal.h - Declarations for global variables
- *       $Revision: 134 $
+ *       $Revision: 135 $
  *
  *****************************************************************************/
 
@@ -141,9 +141,9 @@ ACPI_EXTERN u8                          acpi_gbl_events_initialized;
 extern u8                               acpi_gbl_shutdown;
 extern u32                              acpi_gbl_startup_flags;
 extern const u8                         acpi_gbl_decode_to8bit[8];
-extern const NATIVE_CHAR               *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT];
+extern const char                      *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT];
 extern const acpi_opcode_info           acpi_gbl_aml_op_info[AML_NUM_OPCODES];
-extern const NATIVE_CHAR               *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
+extern const char                      *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
 
 /*****************************************************************************
@@ -257,21 +257,21 @@ extern      u8                          acpi_gbl_abort_method;
 extern      u8                          acpi_gbl_db_terminate_threads;
 
 ACPI_EXTERN int                         optind;
-ACPI_EXTERN NATIVE_CHAR                *optarg;
+ACPI_EXTERN char                       *optarg;
 
 ACPI_EXTERN u8                          acpi_gbl_db_opt_tables;
 ACPI_EXTERN u8                          acpi_gbl_db_opt_stats;
 ACPI_EXTERN u8                          acpi_gbl_db_opt_ini_methods;
 
 
-ACPI_EXTERN NATIVE_CHAR                *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN NATIVE_CHAR                 acpi_gbl_db_line_buf[80];
-ACPI_EXTERN NATIVE_CHAR                 acpi_gbl_db_parsed_buf[80];
-ACPI_EXTERN NATIVE_CHAR                 acpi_gbl_db_scope_buf[40];
-ACPI_EXTERN NATIVE_CHAR                 acpi_gbl_db_debug_filename[40];
+ACPI_EXTERN char                       *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_EXTERN char                        acpi_gbl_db_line_buf[80];
+ACPI_EXTERN char                        acpi_gbl_db_parsed_buf[80];
+ACPI_EXTERN char                        acpi_gbl_db_scope_buf[40];
+ACPI_EXTERN char                        acpi_gbl_db_debug_filename[40];
 ACPI_EXTERN u8                          acpi_gbl_db_output_to_file;
-ACPI_EXTERN NATIVE_CHAR                *acpi_gbl_db_buffer;
-ACPI_EXTERN NATIVE_CHAR                *acpi_gbl_db_filename;
+ACPI_EXTERN char                       *acpi_gbl_db_buffer;
+ACPI_EXTERN char                       *acpi_gbl_db_filename;
 ACPI_EXTERN u32                         acpi_gbl_db_debug_level;
 ACPI_EXTERN u32                         acpi_gbl_db_console_debug_level;
 ACPI_EXTERN acpi_table_header          *acpi_gbl_db_table_ptr;

drivers/acpi/include/acinterp.h

 /******************************************************************************
  *
  * Name: acinterp.h - Interpreter subcomponent prototypes and defines
- *       $Revision: 142 $
+ *       $Revision: 144 $
  *
  *****************************************************************************/
 
@@ -92,7 +92,8 @@ u32
 acpi_ex_convert_to_ascii (
 	acpi_integer            integer,
 	u32                     base,
-	u8                      *string);
+	u8                      *string,
+	u8                      max_length);
 
 /*
  * exfield - ACPI AML (p-code) execution - field manipulation
@@ -454,10 +455,10 @@ void
 acpi_ex_dump_operands (
 	acpi_operand_object     **operands,
 	acpi_interpreter_mode   interpreter_mode,
-	NATIVE_CHAR             *ident,
+	char                    *ident,
 	u32                     num_levels,
-	NATIVE_CHAR             *note,
-	NATIVE_CHAR             *module_name,
+	char                    *note,
+	char                    *module_name,
 	u32                     line_number);
 
 void
@@ -495,7 +496,7 @@ acpi_ex_out_address (
  * exnames - interpreter/scanner name load/execute
  */
 
-NATIVE_CHAR *
+char *
 acpi_ex_allocate_name_string (
 	u32                     prefix_count,
 	u32                     num_name_segs);
@@ -507,13 +508,13 @@ acpi_ex_good_char (
 acpi_status
 acpi_ex_name_segment (
 	u8                      **in_aml_address,
-	NATIVE_CHAR             *name_string);
+	char                    *name_string);
 
 acpi_status
 acpi_ex_get_name_string (
 	acpi_object_type        data_type,
 	u8                      *in_aml_address,
-	NATIVE_CHAR             **out_name_string,
+	char                    **out_name_string,
 	u32                     *out_name_length);
 
 acpi_status
@@ -629,12 +630,12 @@ acpi_ex_digits_needed (
 void
 acpi_ex_eisa_id_to_string (
 	u32                     numeric_id,
-	NATIVE_CHAR             *out_string);
+	char                    *out_string);
 
 void
 acpi_ex_unsigned_integer_to_string (
 	acpi_integer            value,
-	NATIVE_CHAR             *out_string);
+	char                    *out_string);
 
 
 /*

drivers/acpi/include/aclocal.h

 /******************************************************************************
  *
  * Name: aclocal.h - Internal data types used across the ACPI subsystem
- *       $Revision: 182 $
+ *       $Revision: 183 $
  *
  *****************************************************************************/
 
@@ -78,7 +78,7 @@ typedef u32                             ACPI_MUTEX_HANDLE;
 
 /* Names for the mutexes used in the subsystem */
 
-static NATIVE_CHAR          *acpi_gbl_mutex_names[] =
+static char                 *acpi_gbl_mutex_names[] =
 {
 	"ACPI_MTX_Execute",
 	"ACPI_MTX_Interpreter",
@@ -227,7 +227,7 @@ typedef struct acpi_table_desc
 
 typedef struct
 {
-	NATIVE_CHAR             *search_for;
+	char                    *search_for;
 	acpi_handle             *list;
 	u32                     *count;
 
@@ -245,9 +245,9 @@ typedef struct
  */
 typedef struct
 {
-	NATIVE_CHAR             *name;
+	char                    *name;
 	u8                      type;
-	NATIVE_CHAR             *val;
+	char                    *val;
 
 } acpi_predefined_names;
 
@@ -262,9 +262,9 @@ typedef struct
 
 typedef struct acpi_namestring_info
 {
-	NATIVE_CHAR             *external_name;
-	NATIVE_CHAR             *next_external_char;
-	NATIVE_CHAR             *internal_name;
+	char                    *external_name;
+	char                    *next_external_char;
+	char                    *internal_name;
 	u32                     length;
 	u32                     num_segments;
 	u32                     num_carats;
@@ -566,7 +566,7 @@ acpi_status (*ACPI_EXECUTE_OP) (
 typedef struct acpi_opcode_info
 {
 #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
-	NATIVE_CHAR             *name;          /* Opcode name (disassembler/debug only) */
+	char                    *name;          /* Opcode name (disassembler/debug only) */
 #endif
 	u32                     parse_args;     /* Grammar/Parse time arguments */
 	u32                     runtime_args;   /* Interpret time arguments */
@@ -586,9 +586,9 @@ typedef union acpi_parse_val
 	u16                     integer16;      /* integer constant, 16 bits only */
 	u8                      integer8;       /* integer constant, 8 bits only */
 	u32                     size;           /* bytelist or field size */
-	NATIVE_CHAR             *string;        /* NULL terminated string */
+	char                    *string;        /* NULL terminated string */
 	u8                      *buffer;        /* buffer or string */
-	NATIVE_CHAR             *name;          /* NULL terminated string */
+	char                    *name;          /* NULL terminated string */
 	union acpi_parse_obj    *arg;           /* arguments and contained ops */
 
 } acpi_parse_value;
@@ -604,7 +604,7 @@ typedef union acpi_parse_val
 	ACPI_DISASM_ONLY_MEMBERS (\
 	u8                      disasm_flags;   /* Used during AML disassembly */\
 	u8                      disasm_opcode;  /* Subtype used for disassembly */\
-	NATIVE_CHAR             aml_op_name[16]) /* op name (debug only) */\
+	char                    aml_op_name[16]) /* op name (debug only) */\
 			  /* NON-DEBUG members below: */\
 	acpi_namespace_node     *node;          /* for use by interpreter */\
 	acpi_parse_value        value;          /* Value or args associated with the opcode */\
@@ -890,11 +890,11 @@ typedef struct
 typedef struct dbmethodinfo
 {
 	acpi_handle             thread_gate;
-	NATIVE_CHAR             *name;
-	NATIVE_CHAR             **args;
+	char                    *name;
+	char                    **args;
 	u32                     flags;
 	u32                     num_loops;
-	NATIVE_CHAR             pathname[128];
+	char                    pathname[128];
 
 } acpi_db_method_info;
 
@@ -913,8 +913,8 @@ typedef struct dbmethodinfo
 typedef struct
 {
 	u32                     component_id;
-	NATIVE_CHAR             *proc_name;
-	NATIVE_CHAR             *module_name;
+	char                    *proc_name;
+	char                    *module_name;
 
 } acpi_debug_print_info;
 
@@ -931,7 +931,7 @@ typedef struct
 	u32                         size; \
 	u32                         component; \
 	u32                         line; \
-	NATIVE_CHAR                 module[ACPI_MAX_MODULE_NAME]; \
+	char                        module[ACPI_MAX_MODULE_NAME]; \
 	u8                          alloc_type;
 
 typedef struct

drivers/acpi/include/acmacros.h

 /******************************************************************************
  *
  * Name: acmacros.h - C macros for the entire subsystem.
- *       $Revision: 133 $
+ *       $Revision: 135 $
  *
  *****************************************************************************/
 
@@ -334,11 +334,11 @@
  * 4) Reserved field is zero
  * 5) Expand address to 64 bits
  */
-#define ASL_BUILD_GAS_FROM_ENTRY(a,b,c,d)   {a.address_space_id = (u8) d;\
+#define ASL_BUILD_GAS_FROM_ENTRY(a,b,c,d)   do {a.address_space_id = (u8) d;\
 											 a.register_bit_width = (u8) ACPI_MUL_8 (b);\
 											 a.register_bit_offset = 0;\
 											 a.reserved = 0;\
-											 ACPI_STORE_ADDRESS (a.address,(ACPI_PHYSICAL_ADDRESS) c);}
+											 ACPI_STORE_ADDRESS (a.address,(ACPI_PHYSICAL_ADDRESS) c);} while (0)
 
 /* ACPI V1.0 entries -- address space is always I/O */
 
@@ -418,7 +418,7 @@
 #define ACPI_FUNCTION_TRACE_U32(a,b)    ACPI_FUNCTION_NAME(a)\
 											acpi_ut_trace_u32(__LINE__,&_dbg,(u32)b)
 #define ACPI_FUNCTION_TRACE_STR(a,b)    ACPI_FUNCTION_NAME(a)\
-											acpi_ut_trace_str(__LINE__,&_dbg,(NATIVE_CHAR *)b)
+											acpi_ut_trace_str(__LINE__,&_dbg,(char *)b)
 
 #define ACPI_FUNCTION_ENTRY()           acpi_ut_track_stack_ptr()
 

drivers/acpi/include/acnamesp.h

 /******************************************************************************
  *
  * Name: acnamesp.h - Namespace subcomponent prototypes and defines
- *       $Revision: 131 $
+ *       $Revision: 132 $
  *
  *****************************************************************************/
 
@@ -146,7 +146,7 @@ acpi_ns_root_initialize (
 acpi_status
 acpi_ns_lookup (
 	acpi_generic_state      *scope_info,
-	NATIVE_CHAR             *name,
+	char                    *name,
 	acpi_object_type        type,
 	acpi_interpreter_mode   interpreter_mode,
 	u32                     flags,
@@ -213,7 +213,7 @@ acpi_ns_dump_entry (
 void
 acpi_ns_dump_pathname (
 	acpi_handle             handle,
-	NATIVE_CHAR             *msg,
+	char                    *msg,
 	u32                     level,
 	u32                     component);
 
@@ -261,14 +261,14 @@ acpi_ns_evaluate_by_handle (
 
 acpi_status
 acpi_ns_evaluate_by_name (
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_operand_object     **params,
 	acpi_operand_object     **return_object);
 
 acpi_status
 acpi_ns_evaluate_relative (
 	acpi_namespace_node     *prefix_node,
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_operand_object     **params,
 	acpi_operand_object     **return_object);
 
@@ -305,13 +305,13 @@ void
 acpi_ns_build_external_path (
 	acpi_namespace_node     *node,
 	ACPI_SIZE               size,
-	NATIVE_CHAR             *name_buffer);
+	char                    *name_buffer);
 
-NATIVE_CHAR *
+char *
 acpi_ns_get_external_pathname (
 	acpi_namespace_node     *node);
 
-NATIVE_CHAR *
+char *
 acpi_ns_name_of_current_scope (
 	acpi_walk_state         *walk_state);
 
@@ -323,11 +323,11 @@ acpi_ns_handle_to_pathname (
 u8
 acpi_ns_pattern_match (
 	acpi_namespace_node     *obj_node,
-	NATIVE_CHAR             *search_for);
+	char                    *search_for);
 
 acpi_status
 acpi_ns_get_node_by_path (
-	NATIVE_CHAR             *external_pathname,
+	char                    *external_pathname,
 	acpi_namespace_node     *in_prefix_node,
 	u32                     flags,
 	acpi_namespace_node     **out_node);
@@ -408,11 +408,11 @@ acpi_ns_install_node (
 
 u8
 acpi_ns_valid_root_prefix (
-	NATIVE_CHAR             prefix);
+	char                    prefix);
 
 u8
 acpi_ns_valid_path_separator (
-	NATIVE_CHAR             sep);
+	char                    sep);
 
 acpi_object_type
 acpi_ns_get_type (
@@ -424,7 +424,7 @@ acpi_ns_local (
 
 void
 acpi_ns_report_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	char                    *internal_name,
@@ -432,7 +432,7 @@ acpi_ns_report_error (
 
 void
 acpi_ns_report_method_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	char                    *message,
@@ -443,7 +443,7 @@ acpi_ns_report_method_error (
 void
 acpi_ns_print_node_pathname (
 	acpi_namespace_node     *node,
-	NATIVE_CHAR             *msg);
+	char                    *msg);
 
 acpi_status
 acpi_ns_build_internal_name (
@@ -455,15 +455,15 @@ acpi_ns_get_internal_name_length (
 
 acpi_status
 acpi_ns_internalize_name (
-	NATIVE_CHAR             *dotted_name,
-	NATIVE_CHAR             **converted_name);
+	char                    *dotted_name,
+	char                    **converted_name);
 
 acpi_status
 acpi_ns_externalize_name (
 	u32                     internal_name_length,
-	NATIVE_CHAR             *internal_name,
+	char                    *internal_name,
 	u32                     *converted_name_length,
-	NATIVE_CHAR             **converted_name);
+	char                    **converted_name);
 
 acpi_namespace_node *
 acpi_ns_map_handle_to_node (

drivers/acpi/include/acobject.h

@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Name: acobject.h - Definition of acpi_operand_object  (Internal object only)
- *       $Revision: 114 $
+ *       $Revision: 115 $
  *
  *****************************************************************************/
 
@@ -125,7 +125,7 @@ typedef struct acpi_object_string                   /* Null terminated, ASCII ch
 {
 	ACPI_OBJECT_COMMON_HEADER
 	ACPI_COMMON_BUFFER_INFO
-	NATIVE_CHAR                 *pointer;           /* String in AML stream or allocated string */
+	char                        *pointer;           /* String in AML stream or allocated string */
 
 } ACPI_OBJECT_STRING;
 

drivers/acpi/include/acparser.h

 /******************************************************************************
  *
  * Module Name: acparser.h - AML Parser subcomponent prototypes and defines
- *       $Revision: 63 $
+ *       $Revision: 64 $
  *
  *****************************************************************************/
 
@@ -77,7 +77,7 @@ u32
 acpi_ps_get_next_package_length (
 	acpi_parse_state        *parser_state);
 
-NATIVE_CHAR *
+char *
 acpi_ps_get_next_namestring (
 	acpi_parse_state        *parser_state);
 
@@ -125,7 +125,7 @@ const acpi_opcode_info *
 acpi_ps_get_opcode_info (
 	u16                     opcode);
 
-NATIVE_CHAR *
+char *
 acpi_ps_get_opcode_name (
 	u16                     opcode);
 
@@ -222,7 +222,7 @@ acpi_ps_append_arg(
 acpi_parse_object*
 acpi_ps_find (
 	acpi_parse_object       *scope,
-	NATIVE_CHAR             *path,
+	char                    *path,
 	u16                     opcode,
 	u32                     create);
 
@@ -311,13 +311,13 @@ acpi_ps_set_name(
 
 u32
 acpi_ps_sprint_path (
-	NATIVE_CHAR             *buffer_start,
+	char                    *buffer_start,
 	u32                     buffer_size,
 	acpi_parse_object       *op);
 
 u32
 acpi_ps_sprint_op (
-	NATIVE_CHAR             *buffer_start,
+	char                    *buffer_start,
 	u32                     buffer_size,
 	acpi_parse_object       *op);
 

drivers/acpi/include/acpiosxf.h

@@ -251,9 +251,9 @@ acpi_os_write_pci_configuration (
  */
 void
 acpi_os_derive_pci_id(
-	acpi_handle	            rhandle,
+	acpi_handle             rhandle,
 	acpi_handle             chandle,
-	acpi_pci_id	            **pci_id);
+	acpi_pci_id             **pci_id);
 
 /*
  * Miscellaneous
@@ -284,12 +284,12 @@ acpi_os_signal (
 
 void ACPI_INTERNAL_VAR_XFACE
 acpi_os_printf (
-	const NATIVE_CHAR       *format,
+	const char              *format,
 	...);
 
 void
 acpi_os_vprintf (
-	const NATIVE_CHAR       *format,
+	const char              *format,
 	va_list                 args);
 
 void
@@ -303,7 +303,7 @@ acpi_os_redirect_output (
 
 u32
 acpi_os_get_line (
-	NATIVE_CHAR             *buffer);
+	char                    *buffer);
 
 
 /*
@@ -315,7 +315,7 @@ acpi_os_dbg_assert(
 	void                    *failed_assertion,
 	void                    *file_name,
 	u32                     line_number,
-	NATIVE_CHAR             *message);
+	char                    *message);
 
 
 #endif /* __ACPIOSXF_H__ */

drivers/acpi/include/acpixf.h

@@ -153,7 +153,7 @@ acpi_walk_namespace (
 
 acpi_status
 acpi_get_devices (
-	NATIVE_CHAR             *HID,
+	char                    *HID,
 	acpi_walk_callback      user_function,
 	void                    *context,
 	void                    **return_value);

drivers/acpi/include/acstruct.h

 /******************************************************************************
  *
  * Name: acstruct.h - Internal structs
- *       $Revision: 21 $
+ *       $Revision: 22 $
  *
  *****************************************************************************/
 
@@ -152,7 +152,7 @@ typedef struct acpi_get_devices_info
 {
 	acpi_walk_callback      user_function;
 	void                    *context;
-	NATIVE_CHAR             *hid;
+	char                    *hid;
 
 } acpi_get_devices_info;
 

drivers/acpi/include/actables.h

 /******************************************************************************
  *
  * Name: actables.h - ACPI table management
- *       $Revision: 42 $
+ *       $Revision: 43 $
  *
  *****************************************************************************/
 
@@ -132,7 +132,7 @@ acpi_tb_install_table (
 
 acpi_status
 acpi_tb_match_signature (
-	NATIVE_CHAR             *signature,
+	char                    *signature,
 	acpi_table_desc         *table_info,
 	u8                      search_type);
 
@@ -197,9 +197,9 @@ acpi_tb_find_rsdp (
 
 acpi_status
 acpi_tb_find_table (
-	NATIVE_CHAR             *signature,
-	NATIVE_CHAR             *oem_id,
-	NATIVE_CHAR             *oem_table_id,
+	char                    *signature,
+	char                    *oem_id,
+	char                    *oem_table_id,
 	acpi_table_header       **table_ptr);
 
 acpi_status

drivers/acpi/include/actbl.h

 /******************************************************************************
  *
  * Name: actbl.h - Table data structures defined in ACPI specification
- *       $Revision: 53 $
+ *       $Revision: 54 $
  *
  *****************************************************************************/
 
@@ -76,29 +76,29 @@
  */
 typedef struct  /* Root System Descriptor Pointer */
 {
-	NATIVE_CHAR             signature [8];          /* ACPI signature, contains "RSD PTR " */
+	char                    signature [8];          /* ACPI signature, contains "RSD PTR " */
 	u8                      checksum;               /* To make sum of struct == 0 */
-	NATIVE_CHAR             oem_id [6];             /* OEM identification */
+	char                    oem_id [6];             /* OEM identification */
 	u8                      revision;               /* Must be 0 for 1.0, 2 for 2.0 */
 	u32                     rsdt_physical_address;  /* 32-bit physical address of RSDT */
 	u32                     length;                 /* XSDT Length in bytes including hdr */
 	u64                     xsdt_physical_address;  /* 64-bit physical address of XSDT */
 	u8                      extended_checksum;      /* Checksum of entire table */
-	NATIVE_CHAR             reserved [3];           /* Reserved field must be 0 */
+	char                    reserved [3];           /* Reserved field must be 0 */
 
 } RSDP_DESCRIPTOR;
 
 
 typedef struct  /* ACPI common table header */
 {
-	NATIVE_CHAR             signature [4];          /* ACPI signature (4 ASCII characters) */
+	char                    signature [4];          /* ACPI signature (4 ASCII characters) */
 	u32                     length;                 /* Length of table, in bytes, including header */
 	u8                      revision;               /* ACPI Specification minor version # */
 	u8                      checksum;               /* To make sum of entire table == 0 */
-	NATIVE_CHAR             oem_id [6];             /* OEM identification */
-	NATIVE_CHAR             oem_table_id [8];       /* OEM table identification */
+	char                    oem_id [6];             /* OEM identification */
+	char                    oem_table_id [8];       /* OEM table identification */
 	u32                     oem_revision;           /* OEM revision number */
-	NATIVE_CHAR             asl_compiler_id [4];    /* ASL compiler vendor ID */
+	char                    asl_compiler_id [4];    /* ASL compiler vendor ID */
 	u32                     asl_compiler_revision;  /* ASL compiler revision number */
 
 } acpi_table_header;
@@ -199,8 +199,8 @@ typedef struct  /* Smart Battery Description Table */
 
 typedef struct _acpi_table_support
 {
-	NATIVE_CHAR             *name;
-	NATIVE_CHAR             *signature;
+	char                    *name;
+	char                    *signature;
 	void                    **global_ptr;
 	u8                      sig_length;
 	u8                      flags;

drivers/acpi/include/actbl1.h

 /******************************************************************************
  *
  * Name: actbl1.h - ACPI 1.0 tables
- *       $Revision: 21 $
+ *       $Revision: 22 $
  *
  *****************************************************************************/
 
@@ -44,7 +44,7 @@ typedef struct
  */
 typedef struct
 {
-	NATIVE_CHAR             signature[4];           /* ACPI Signature */
+	char                    signature[4];           /* ACPI Signature */
 	u32                     length;                 /* Length of structure, in bytes */
 	u32                     hardware_signature;     /* Hardware configuration signature */
 	u32                     firmware_waking_vector; /* ACPI OS waking vector */

drivers/acpi/include/actbl2.h

 /******************************************************************************
  *
  * Name: actbl2.h - ACPI Specification Revision 2.0 Tables
- *       $Revision: 28 $
+ *       $Revision: 29 $
  *
  *****************************************************************************/
 
@@ -75,7 +75,7 @@ typedef struct
  */
 typedef struct
 {
-	NATIVE_CHAR             signature[4];           /* ACPI signature */
+	char                    signature[4];           /* ACPI signature */
 	u32                     length;                 /* Length of structure, in bytes */
 	u32                     hardware_signature;     /* Hardware configuration signature */
 	u32                     firmware_waking_vector; /* 32bit physical address of the Firmware Waking Vector. */

drivers/acpi/include/actypes.h

 /******************************************************************************
  *
  * Name: actypes.h - Common data types for the entire ACPI subsystem
- *       $Revision: 242 $
+ *       $Revision: 244 $
  *
  *****************************************************************************/
 
@@ -629,7 +629,7 @@ typedef union acpi_obj
 	{
 		acpi_object_type            type;
 		u32                         length;     /* # of bytes in string, excluding trailing null */
-		NATIVE_CHAR                 *pointer;   /* points to the string value */
+		char                        *pointer;   /* points to the string value */
 	} string;
 
 	struct
@@ -835,8 +835,8 @@ typedef struct
 	ACPI_COMMON_OBJ_INFO;
 
 	u32                         valid;              /*  Are the next bits legit? */
-	NATIVE_CHAR                 hardware_id[9];     /*  _HID value if any */
-	NATIVE_CHAR                 unique_id[9];       /*  _UID value if any */
+	char                        hardware_id[9];     /*  _HID value if any */
+	char                        unique_id[9];       /*  _UID value if any */
 	acpi_integer                address;            /*  _ADR value if any */
 	u32                         current_status;     /*  _STA value */
 } acpi_device_info;
@@ -1070,7 +1070,7 @@ typedef struct
 {
 	u32                         index;
 	u32                         string_length;
-	NATIVE_CHAR                 *string_ptr;
+	char                        *string_ptr;
 
 } acpi_resource_source;
 
@@ -1209,7 +1209,7 @@ typedef struct acpi_pci_routing_table
 	u32                         pin;
 	acpi_integer                address;        /* here for 64-bit alignment */
 	u32                         source_index;
-	NATIVE_CHAR                 source[4];      /* pad to 64 bits so sizeof() works in all cases */
+	char                        source[4];      /* pad to 64 bits so sizeof() works in all cases */
 
 } acpi_pci_routing_table;
 

drivers/acpi/include/acutils.h

 /******************************************************************************
  *
  * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
- *       $Revision: 149 $
+ *       $Revision: 150 $
  *
  *****************************************************************************/
 
@@ -96,25 +96,25 @@ acpi_ut_validate_fadt (
 
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_mutex_name (
 	u32                     mutex_id);
 
 #endif
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_type_name (
 	acpi_object_type        type);
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_object_type_name (
 	acpi_operand_object     *obj_desc);
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_region_name (
 	u8                      space_id);
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_event_name (
 	u32                     event_id);
 
@@ -140,51 +140,51 @@ acpi_ut_allocate_owner_id (
 
 ACPI_SIZE
 acpi_ut_strlen (
-	const NATIVE_CHAR       *string);
+	const char              *string);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strcpy (
-	NATIVE_CHAR             *dst_string,
-	const NATIVE_CHAR       *src_string);
+	char                    *dst_string,
+	const char              *src_string);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strncpy (
-	NATIVE_CHAR             *dst_string,
-	const NATIVE_CHAR       *src_string,
+	char                    *dst_string,
+	const char              *src_string,
 	ACPI_SIZE               count);
 
 int
 acpi_ut_strncmp (
-	const NATIVE_CHAR       *string1,
-	const NATIVE_CHAR       *string2,
+	const char              *string1,
+	const char              *string2,
 	ACPI_SIZE               count);
 
 int
 acpi_ut_strcmp (
-	const NATIVE_CHAR       *string1,
-	const NATIVE_CHAR       *string2);
+	const char              *string1,
+	const char              *string2);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strcat (
-	NATIVE_CHAR             *dst_string,
-	const NATIVE_CHAR       *src_string);
+	char                    *dst_string,
+	const char              *src_string);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strncat (
-	NATIVE_CHAR             *dst_string,
-	const NATIVE_CHAR       *src_string,
+	char                    *dst_string,
+	const char              *src_string,
 	ACPI_SIZE               count);
 
 u32
 acpi_ut_strtoul (
-	const NATIVE_CHAR       *string,
-	NATIVE_CHAR             **terminator,
+	const char              *string,
+	char                    **terminator,
 	u32                     base);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strstr (
-	NATIVE_CHAR             *string1,
-	NATIVE_CHAR             *string2);
+	char                    *string1,
+	char                    *string2);
 
 void *
 acpi_ut_memcpy (
@@ -342,7 +342,7 @@ void
 acpi_ut_trace_str (
 	u32                     line_number,
 	acpi_debug_print_info   *dbg_info,
-	NATIVE_CHAR             *string);
+	char                    *string);
 
 void
 acpi_ut_exit (
@@ -369,19 +369,19 @@ acpi_ut_ptr_exit (
 
 void
 acpi_ut_report_info (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
 void
 acpi_ut_report_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
 void
 acpi_ut_report_warning (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
@@ -450,13 +450,13 @@ acpi_ut_delete_internal_object_list (
 acpi_status
 acpi_ut_evaluate_object (
 	acpi_namespace_node     *prefix_node,
-	NATIVE_CHAR             *path,
+	char                    *path,
 	u32                     expected_return_btypes,
 	acpi_operand_object     **return_desc);
 
 acpi_status
 acpi_ut_evaluate_numeric_object (
-	NATIVE_CHAR             *object_name,
+	char                    *object_name,
 	acpi_namespace_node     *device_node,
 	acpi_integer            *address);
 
@@ -516,14 +516,14 @@ acpi_ut_release_mutex (
 
 acpi_operand_object  *
 acpi_ut_create_internal_object_dbg (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	acpi_object_type        type);
 
 void *
 acpi_ut_allocate_object_desc_dbg (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
@@ -673,17 +673,17 @@ acpi_ut_valid_acpi_name (
 
 u8
 acpi_ut_valid_acpi_character (
-	NATIVE_CHAR             character);
+	char                    character);
 
 acpi_status
 acpi_ut_strtoul64 (
-	NATIVE_CHAR             *string,
+	char                    *string,
 	u32                     base,
 	acpi_integer            *ret_integer);
 
-NATIVE_CHAR *
+char *
 acpi_ut_strupr (
-	NATIVE_CHAR             *src_string);
+	char                    *src_string);
 
 u8 *
 acpi_ut_get_resource_end_tag (
@@ -745,14 +745,14 @@ void *
 acpi_ut_allocate (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 void *
 acpi_ut_callocate (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 
@@ -762,21 +762,21 @@ void *
 acpi_ut_allocate_and_track (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 void *
 acpi_ut_callocate_and_track (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 void
 acpi_ut_free_and_track (
 	void                    *address,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 acpi_debug_mem_block *
@@ -791,7 +791,7 @@ acpi_ut_track_allocation (
 	ACPI_SIZE               size,
 	u8                      alloc_type,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 acpi_status
@@ -799,7 +799,7 @@ acpi_ut_remove_allocation (
 	u32                     list_id,
 	acpi_debug_mem_block    *address,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line);
 
 void
@@ -809,7 +809,7 @@ acpi_ut_dump_allocation_info (
 void
 acpi_ut_dump_allocations (
 	u32                     component,
-	NATIVE_CHAR             *module);
+	char                    *module);
 #endif
 
 

drivers/acpi/include/platform/aclinux.h

 /******************************************************************************
  *
  * Name: aclinux.h - OS specific defines, etc.
- *       $Revision: 27 $
+ *       $Revision: 29 $
  *
  *****************************************************************************/
 
@@ -43,7 +43,7 @@
 
 #define strtoul simple_strtoul
 
-#define ACPI_MACHINE_WIDTH	BITS_PER_LONG
+#define ACPI_MACHINE_WIDTH  BITS_PER_LONG
 
 #else /* !__KERNEL__ */
 
@@ -54,13 +54,13 @@
 #include <unistd.h>
 
 #if defined(__ia64__) || defined(__x86_64__)
-#define ACPI_MACHINE_WIDTH		64
-#define COMPILER_DEPENDENT_INT64	long
-#define COMPILER_DEPENDENT_UINT64	unsigned long
+#define ACPI_MACHINE_WIDTH	    64
+#define COMPILER_DEPENDENT_INT64    long
+#define COMPILER_DEPENDENT_UINT64   unsigned long
 #else
-#define ACPI_MACHINE_WIDTH		32
-#define COMPILER_DEPENDENT_INT64	long long
-#define COMPILER_DEPENDENT_UINT64	unsigned long long
+#define ACPI_MACHINE_WIDTH	    32
+#define COMPILER_DEPENDENT_INT64    long long
+#define COMPILER_DEPENDENT_UINT64   unsigned long long
 #define ACPI_USE_NATIVE_DIVIDE
 #endif
 

drivers/acpi/namespace/nsaccess.c

 /*******************************************************************************
  *
  * Module Name: nsaccess - Top-level functions for accessing ACPI namespace
- *              $Revision: 165 $
+ *              $Revision: 167 $
  *
  ******************************************************************************/
 
@@ -234,7 +234,7 @@ acpi_ns_root_initialize (void)
 acpi_status
 acpi_ns_lookup (
 	acpi_generic_state      *scope_info,
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_object_type        type,
 	acpi_interpreter_mode   interpreter_mode,
 	u32                     flags,
@@ -242,7 +242,7 @@ acpi_ns_lookup (
 	acpi_namespace_node     **return_node)
 {
 	acpi_status             status;
-	NATIVE_CHAR             *path = pathname;
+	char                    *path = pathname;
 	acpi_namespace_node     *prefix_node;
 	acpi_namespace_node     *current_node = NULL;
 	acpi_namespace_node     *this_node = NULL;

drivers/acpi/namespace/nsalloc.c

 /*******************************************************************************
  *
  * Module Name: nsalloc - Namespace allocation and deletion utilities
- *              $Revision: 77 $
+ *              $Revision: 78 $
  *
  ******************************************************************************/
 

drivers/acpi/namespace/nsdump.c

 /******************************************************************************
  *
  * Module Name: nsdump - table dumping routines for debug
- *              $Revision: 149 $
+ *              $Revision: 150 $
  *
  *****************************************************************************/
 
@@ -93,7 +93,7 @@ acpi_ns_print_pathname (
 void
 acpi_ns_dump_pathname (
 	acpi_handle             handle,
-	NATIVE_CHAR             *msg,
+	char                    *msg,
 	u32                     level,
 	u32                     component)
 {

drivers/acpi/namespace/nseval.c

@@ -2,7 +2,7 @@
  *
  * Module Name: nseval - Object evaluation interfaces -- includes control
  *                       method lookup and execution.
- *              $Revision: 119 $
+ *              $Revision: 120 $
  *
  ******************************************************************************/
 
@@ -60,14 +60,14 @@
 acpi_status
 acpi_ns_evaluate_relative (
 	acpi_namespace_node     *handle,
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_operand_object     **params,
 	acpi_operand_object     **return_object)
 {
 	acpi_namespace_node     *prefix_node;
 	acpi_status             status;
 	acpi_namespace_node     *node = NULL;
-	NATIVE_CHAR             *internal_path = NULL;
+	char                    *internal_path = NULL;
 	acpi_generic_state      scope_info;
 
 
@@ -158,13 +158,13 @@ acpi_ns_evaluate_relative (
 
 acpi_status
 acpi_ns_evaluate_by_name (
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_operand_object     **params,
 	acpi_operand_object     **return_object)
 {
 	acpi_status             status;
 	acpi_namespace_node     *node = NULL;
-	NATIVE_CHAR             *internal_path = NULL;
+	char                    *internal_path = NULL;
 
 
 	ACPI_FUNCTION_TRACE ("Ns_evaluate_by_name");

drivers/acpi/namespace/nsinit.c

 /******************************************************************************
  *
  * Module Name: nsinit - namespace initialization
- *              $Revision: 52 $
+ *              $Revision: 54 $
  *
  *****************************************************************************/
 
@@ -373,7 +373,7 @@ acpi_ns_init_one_device (
 			/* Ignore error and move on to next device */
 
 	#ifdef ACPI_DEBUG_OUTPUT
-			NATIVE_CHAR *scope_name = acpi_ns_get_external_pathname (obj_handle);
+			char        *scope_name = acpi_ns_get_external_pathname (obj_handle);
 
 			ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "%s._INI failed: %s\n",
 					scope_name, acpi_format_exception (status)));

drivers/acpi/namespace/nsnames.c

 /*******************************************************************************
  *
  * Module Name: nsnames - Name manipulation and search
- *              $Revision: 80 $
+ *              $Revision: 81 $
  *
  ******************************************************************************/
 
@@ -52,7 +52,7 @@ void
 acpi_ns_build_external_path (
 	acpi_namespace_node     *node,
 	ACPI_SIZE               size,
-	NATIVE_CHAR             *name_buffer)
+	char                    *name_buffer)
 {
 	ACPI_SIZE               index;
 	acpi_namespace_node     *parent_node;
@@ -118,11 +118,11 @@ acpi_ns_build_external_path (
  *
  ******************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ns_get_external_pathname (
 	acpi_namespace_node     *node)
 {
-	NATIVE_CHAR             *name_buffer;
+	char                    *name_buffer;
 	ACPI_SIZE               size;
 
 

drivers/acpi/namespace/nsobject.c

@@ -2,7 +2,7 @@
  *
  * Module Name: nsobject - Utilities for objects attached to namespace
  *                         table entries
- *              $Revision: 85 $
+ *              $Revision: 86 $
  *
  ******************************************************************************/
 

drivers/acpi/namespace/nsparse.c

 /******************************************************************************
  *
  * Module Name: nsparse - namespace interface to AML parser
- *              $Revision: 1 $
+ *              $Revision: 2 $
  *
  *****************************************************************************/
 

drivers/acpi/namespace/nssearch.c

 /*******************************************************************************
  *
  * Module Name: nssearch - Namespace search
- *              $Revision: 92 $
+ *              $Revision: 94 $
  *
  ******************************************************************************/
 
@@ -74,7 +74,7 @@ acpi_ns_search_node (
 
 #ifdef ACPI_DEBUG_OUTPUT
 	if (ACPI_LV_NAMES & acpi_dbg_level) {
-		NATIVE_CHAR         *scope_name;
+		char                *scope_name;
 
 		scope_name = acpi_ns_get_external_pathname (node);
 		if (scope_name) {

drivers/acpi/namespace/nsutils.c

@@ -2,7 +2,7 @@
  *
  * Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
  *                        parents and siblings and Scope manipulation
- *              $Revision: 118 $
+ *              $Revision: 120 $
  *
  *****************************************************************************/
 
@@ -51,7 +51,7 @@
 
 void
 acpi_ns_report_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	char                    *internal_name,
@@ -103,7 +103,7 @@ acpi_ns_report_error (
 
 void
 acpi_ns_report_method_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	char                    *message,
@@ -144,7 +144,7 @@ acpi_ns_report_method_error (
 void
 acpi_ns_print_node_pathname (
 	acpi_namespace_node     *node,
-	NATIVE_CHAR             *msg)
+	char                    *msg)
 {
 	acpi_buffer             buffer;
 	acpi_status             status;
@@ -176,7 +176,7 @@ acpi_ns_print_node_pathname (
 
 u8
 acpi_ns_valid_root_prefix (
-	NATIVE_CHAR             prefix)
+	char                    prefix)
 {
 
 	return ((u8) (prefix == '\\'));
@@ -197,7 +197,7 @@ acpi_ns_valid_root_prefix (
 
 u8
 acpi_ns_valid_path_separator (
-	NATIVE_CHAR             sep)
+	char                    sep)
 {
 
 	return ((u8) (sep == '.'));
@@ -277,7 +277,7 @@ void
 acpi_ns_get_internal_name_length (
 	acpi_namestring_info    *info)
 {
-	NATIVE_CHAR             *next_external_char;
+	char                    *next_external_char;
 	u32                     i;
 
 
@@ -352,9 +352,9 @@ acpi_ns_build_internal_name (
 	acpi_namestring_info    *info)
 {
 	u32                     num_segments = info->num_segments;
-	NATIVE_CHAR             *internal_name = info->internal_name;
-	NATIVE_CHAR             *external_name = info->next_external_char;
-	NATIVE_CHAR             *result = NULL;
+	char                    *internal_name = info->internal_name;
+	char                    *external_name = info->next_external_char;
+	char                    *result = NULL;
 	NATIVE_UINT             i;
 
 
@@ -470,10 +470,10 @@ acpi_ns_build_internal_name (
 
 acpi_status
 acpi_ns_internalize_name (
-	NATIVE_CHAR             *external_name,
-	NATIVE_CHAR             **converted_name)
+	char                    *external_name,
+	char                    **converted_name)
 {
-	NATIVE_CHAR             *internal_name;
+	char                    *internal_name;
 	acpi_namestring_info    info;
 	acpi_status             status;
 
@@ -865,14 +865,14 @@ acpi_ns_opens_scope (
 
 acpi_status
 acpi_ns_get_node_by_path (
-	NATIVE_CHAR             *pathname,
+	char                    *pathname,
 	acpi_namespace_node     *start_node,
 	u32                     flags,
 	acpi_namespace_node     **return_node)
 {
 	acpi_generic_state      scope_info;
 	acpi_status             status;
-	NATIVE_CHAR             *internal_path = NULL;
+	char                    *internal_path = NULL;
 
 
 	ACPI_FUNCTION_TRACE_PTR ("Ns_get_node_by_path", pathname);

drivers/acpi/namespace/nsxfeval.c

@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfeval - Public interfaces to the ACPI subsystem
  *                         ACPI Object evaluation interfaces
- *              $Revision: 4 $
+ *              $Revision: 6 $
  *
  ******************************************************************************/
 
@@ -518,7 +518,7 @@ acpi_ns_get_device_callback (
 
 acpi_status
 acpi_get_devices (
-	NATIVE_CHAR             *HID,
+	char                    *HID,
 	acpi_walk_callback      user_function,
 	void                    *context,
 	void                    **return_value)

drivers/acpi/namespace/nsxfname.c

@@ -2,7 +2,7 @@
  *
  * Module Name: nsxfname - Public interfaces to the ACPI subsystem
  *                         ACPI Namespace oriented interfaces
- *              $Revision: 92 $
+ *              $Revision: 93 $
  *
  *****************************************************************************/
 
@@ -182,7 +182,7 @@ acpi_get_name (
 
 	ACPI_STRNCPY (buffer->pointer, node->name.ascii,
 			 ACPI_NAME_SIZE);
-	((NATIVE_CHAR *) buffer->pointer) [ACPI_NAME_SIZE] = 0;
+	((char *) buffer->pointer) [ACPI_NAME_SIZE] = 0;
 	status = AE_OK;
 
 

drivers/acpi/parser/psargs.c

 /******************************************************************************
  *
  * Module Name: psargs - Parse AML opcode arguments
- *              $Revision: 65 $
+ *              $Revision: 67 $
  *
  *****************************************************************************/
 
@@ -151,7 +151,7 @@ acpi_ps_get_next_package_end (
  *
  ******************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ps_get_next_namestring (
 	acpi_parse_state        *parser_state)
 {
@@ -206,7 +206,7 @@ acpi_ps_get_next_namestring (
 	}
 
 	parser_state->aml = (u8*) end;
-	return_PTR ((NATIVE_CHAR *) start);
+	return_PTR ((char *) start);
 }
 
 
@@ -238,7 +238,7 @@ acpi_ps_get_next_namepath (
 	acpi_parse_object       *arg,
 	u8                      method_call)
 {
-	NATIVE_CHAR             *path;
+	char                    *path;
 	acpi_parse_object       *name_op;
 	acpi_status             status = AE_OK;
 	acpi_operand_object     *method_desc;

drivers/acpi/parser/psopcode.c

 /******************************************************************************
  *
  * Module Name: psopcode - Parser/Interpreter opcode information table
- *              $Revision: 74 $
+ *              $Revision: 75 $
  *
  *****************************************************************************/
 
@@ -730,7 +730,7 @@ acpi_ps_get_opcode_info (
  *
  ******************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ps_get_opcode_name (
 	u16                     opcode)
 {

drivers/acpi/parser/psparse.c

 /******************************************************************************
  *
  * Module Name: psparse - Parser top level AML parse routines
- *              $Revision: 137 $
+ *              $Revision: 138 $
  *
  *****************************************************************************/
 

drivers/acpi/resources/rsaddr.c

 /*******************************************************************************
  *
  * Module Name: rsaddr - Address resource descriptors (16/32/64)
- *              $Revision: 26 $
+ *              $Revision: 27 $
  *
  ******************************************************************************/
 
@@ -198,7 +198,7 @@ acpi_rs_address16_resource (
 		/* Point the String pointer to the end of this structure */
 
 		output_struct->data.address16.resource_source.string_ptr =
-				(NATIVE_CHAR *)((u8 * )output_struct + struct_size);
+				(char *)((u8 * )output_struct + struct_size);
 
 		temp_ptr = (u8 *) output_struct->data.address16.resource_source.string_ptr;
 
@@ -273,7 +273,7 @@ acpi_rs_address16_stream (
 	u8                      *buffer = *output_buffer;
 	u8                      *length_field;
 	u8                      temp8;
-	NATIVE_CHAR             *temp_pointer = NULL;
+	char                    *temp_pointer = NULL;
 	ACPI_SIZE               actual_bytes;
 
 
@@ -378,7 +378,7 @@ acpi_rs_address16_stream (
 		*buffer = temp8;
 		buffer += 1;
 
-		temp_pointer = (NATIVE_CHAR *) buffer;
+		temp_pointer = (char *) buffer;
 
 		/*
 		 * Copy the string
@@ -583,7 +583,7 @@ acpi_rs_address32_resource (
 		/* Point the String pointer to the end of this structure */
 
 		output_struct->data.address32.resource_source.string_ptr =
-				(NATIVE_CHAR *)((u8 *)output_struct + struct_size);
+				(char *)((u8 *)output_struct + struct_size);
 
 		temp_ptr = (u8 *) output_struct->data.address32.resource_source.string_ptr;
 
@@ -656,7 +656,7 @@ acpi_rs_address32_stream (
 	u8                      *buffer;
 	u16                     *length_field;
 	u8                      temp8;
-	NATIVE_CHAR             *temp_pointer;
+	char                    *temp_pointer;
 
 
 	ACPI_FUNCTION_TRACE ("Rs_address32_stream");
@@ -762,7 +762,7 @@ acpi_rs_address32_stream (
 		*buffer = temp8;
 		buffer += 1;
 
-		temp_pointer = (NATIVE_CHAR *) buffer;
+		temp_pointer = (char *) buffer;
 
 		/*
 		 * Copy the string
@@ -968,7 +968,7 @@ acpi_rs_address64_resource (
 		/* Point the String pointer to the end of this structure */
 
 		output_struct->data.address64.resource_source.string_ptr =
-				(NATIVE_CHAR *)((u8 *)output_struct + struct_size);
+				(char *)((u8 *)output_struct + struct_size);
 
 		temp_ptr = (u8 *) output_struct->data.address64.resource_source.string_ptr;
 
@@ -1042,7 +1042,7 @@ acpi_rs_address64_stream (
 	u8                      *buffer;
 	u16                     *length_field;
 	u8                      temp8;
-	NATIVE_CHAR             *temp_pointer;
+	char                    *temp_pointer;
 
 
 	ACPI_FUNCTION_TRACE ("Rs_address64_stream");
@@ -1149,7 +1149,7 @@ acpi_rs_address64_stream (
 		*buffer = temp8;
 		buffer += 1;
 
-		temp_pointer = (NATIVE_CHAR *) buffer;
+		temp_pointer = (char *) buffer;
 
 		/*
 		 * Copy the string

drivers/acpi/resources/rscreate.c

 /*******************************************************************************
  *
  * Module Name: rscreate - Create resource lists/tables
- *              $Revision: 62 $
+ *              $Revision: 63 $
  *
  ******************************************************************************/
 

drivers/acpi/resources/rsirq.c

 /*******************************************************************************
  *
  * Module Name: rsirq - IRQ resource descriptors
- *              $Revision: 30 $
+ *              $Revision: 31 $
  *
  ******************************************************************************/
 
@@ -386,7 +386,7 @@ acpi_rs_extended_irq_resource (
 		 * Point the String pointer to the end of this structure.
 		 */
 		output_struct->data.extended_irq.resource_source.string_ptr =
-				(NATIVE_CHAR *)(output_struct + struct_size);
+				(char *)(output_struct + struct_size);
 
 		temp_ptr = (u8 *) output_struct->data.extended_irq.resource_source.string_ptr;
 
@@ -460,7 +460,7 @@ acpi_rs_extended_irq_stream (
 	u16                     *length_field;
 	u8                      temp8 = 0;
 	u8                      index;
-	NATIVE_CHAR             *temp_pointer = NULL;
+	char                    *temp_pointer = NULL;
 
 
 	ACPI_FUNCTION_TRACE ("Rs_extended_irq_stream");
@@ -527,7 +527,7 @@ acpi_rs_extended_irq_stream (
 		*buffer = (u8) linked_list->data.extended_irq.resource_source.index;
 		buffer += 1;
 
-		temp_pointer = (NATIVE_CHAR *) buffer;
+		temp_pointer = (char *) buffer;
 
 		/*
 		 * Copy the string

drivers/acpi/sleep.c

@@ -314,8 +314,8 @@ static int
 acpi_system_write_sleep (
 	struct file		*file,
 	const char		*buffer,
-	unsigned long		count,
-	void			*data)
+	size_t			count,
+	loff_t			*ppos)
 {
 	acpi_status		status = AE_OK;
 	char			state_string[12] = {'\0'};
@@ -465,8 +465,8 @@ static int
 acpi_system_write_alarm (
 	struct file		*file,
 	const char		*buffer,
-	unsigned long		count,
-	void			*data)
+	size_t			count,
+	loff_t			*ppos)
 {
 	int			result = 0;
 	char			alarm_string[30] = {'\0'};
@@ -674,7 +674,7 @@ static int __init acpi_sleep_init(void)
 			ACPI_SYSTEM_FILE_SLEEP));
 	else {
 		entry->proc_fops = &acpi_system_sleep_fops;
-		entry->write_proc = acpi_system_write_sleep;
+		entry->proc_fops->write = acpi_system_write_sleep;
 	}
 
 	/* 'alarm' [R/W] */
@@ -686,7 +686,7 @@ static int __init acpi_sleep_init(void)
 			ACPI_SYSTEM_FILE_ALARM));
 	else {
 		entry->proc_fops = &acpi_system_alarm_fops;
-		entry->write_proc = acpi_system_write_alarm;
+		entry->proc_fops->write = acpi_system_write_alarm;
 	}
 
 	/* Install the soft-off (S5) handler. */

drivers/acpi/tables/tbconvrt.c

@@ -256,50 +256,50 @@ acpi_tb_convert_fadt2 (
 	 * we must selectively expand V1.0 fields if the corresponding X field
 	 * is zero.
 	 */
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xfirmware_ctrl))) {
+	if (!(local_fadt->Xfirmware_ctrl)) {
 		ACPI_STORE_ADDRESS (local_fadt->Xfirmware_ctrl, local_fadt->V1_firmware_ctrl);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xdsdt))) {
+	if (!(local_fadt->Xdsdt)) {
 		ACPI_STORE_ADDRESS (local_fadt->Xdsdt, local_fadt->V1_dsdt);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm1a_evt_blk.address))) {
+	if (!(local_fadt->Xpm1a_evt_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm1a_evt_blk,
 			local_fadt->pm1_evt_len, local_fadt->V1_pm1a_evt_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm1b_evt_blk.address))) {
+	if (!(local_fadt->Xpm1b_evt_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm1b_evt_blk,
 			local_fadt->pm1_evt_len, local_fadt->V1_pm1b_evt_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm1a_cnt_blk.address))) {
+	if (!(local_fadt->Xpm1a_cnt_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm1a_cnt_blk,
 			local_fadt->pm1_cnt_len, local_fadt->V1_pm1a_cnt_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm1b_cnt_blk.address))) {
+	if (!(local_fadt->Xpm1b_cnt_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm1b_cnt_blk,
 			local_fadt->pm1_cnt_len, local_fadt->V1_pm1b_cnt_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm2_cnt_blk.address))) {
+	if (!(local_fadt->Xpm2_cnt_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm2_cnt_blk,
 			local_fadt->pm2_cnt_len, local_fadt->V1_pm2_cnt_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xpm_tmr_blk.address))) {
+	if (!(local_fadt->Xpm_tmr_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xpm_tmr_blk,
 			local_fadt->pm_tm_len, local_fadt->V1_pm_tmr_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xgpe0_blk.address))) {
+	if (!(local_fadt->Xgpe0_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xgpe0_blk,
 			local_fadt->gpe0_blk_len, local_fadt->V1_gpe0_blk);
 	}
 
-	if (!(ACPI_GET_ADDRESS (local_fadt->Xgpe1_blk.address))) {
+	if (!(local_fadt->Xgpe1_blk.address)) {
 		ASL_BUILD_GAS_FROM_V1_ENTRY (local_fadt->Xgpe1_blk,
 			local_fadt->gpe1_blk_len, local_fadt->V1_gpe1_blk);
 	}
@@ -437,7 +437,7 @@ acpi_tb_build_common_facs (
 
 	if ((acpi_gbl_RSDP->revision < 2) ||
 		(acpi_gbl_FACS->length < 32) ||
-		(!(ACPI_GET_ADDRESS (acpi_gbl_FACS->Xfirmware_waking_vector)))) {
+		(!(acpi_gbl_FACS->Xfirmware_waking_vector))) {
 		/* ACPI 1.0 FACS or short table or optional X_ field is zero */
 
 		acpi_gbl_common_fACS.firmware_waking_vector = ACPI_CAST_PTR (u64, &(acpi_gbl_FACS->firmware_waking_vector));

drivers/acpi/tables/tbget.c

 /******************************************************************************
  *
  * Module Name: tbget - ACPI Table get* routines
- *              $Revision: 81 $
+ *              $Revision: 82 $
  *
  *****************************************************************************/
 

drivers/acpi/tables/tbgetall.c

 /******************************************************************************
  *
  * Module Name: tbgetall - Get all required ACPI tables
- *              $Revision: 3 $
+ *              $Revision: 4 $
  *
  *****************************************************************************/
 
@@ -212,7 +212,7 @@ acpi_tb_get_required_tables (
 	for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
 		/* Get the table addresss from the common internal XSDT */
 
-		address.pointer.value = ACPI_GET_ADDRESS (acpi_gbl_XSDT->table_offset_entry[i]);
+		address.pointer.value = acpi_gbl_XSDT->table_offset_entry[i];
 
 		/*
 		 * Get the tables needed by this subsystem (FADT and any SSDTs).
@@ -247,7 +247,7 @@ acpi_tb_get_required_tables (
 	/*
 	 * Get the FACS (Pointed to by the FADT)
 	 */
-	address.pointer.value = ACPI_GET_ADDRESS (acpi_gbl_FADT->Xfirmware_ctrl);
+	address.pointer.value = acpi_gbl_FADT->Xfirmware_ctrl;
 
 	status = acpi_tb_get_secondary_table (&address, FACS_SIG, &table_info);
 	if (ACPI_FAILURE (status)) {
@@ -268,7 +268,7 @@ acpi_tb_get_required_tables (
 	/*
 	 * Get/install the DSDT (Pointed to by the FADT)
 	 */
-	address.pointer.value = ACPI_GET_ADDRESS (acpi_gbl_FADT->Xdsdt);
+	address.pointer.value = acpi_gbl_FADT->Xdsdt;
 
 	status = acpi_tb_get_secondary_table (&address, DSDT_SIG, &table_info);
 	if (ACPI_FAILURE (status)) {

drivers/acpi/tables/tbinstal.c

 /******************************************************************************
  *
  * Module Name: tbinstal - ACPI table installation and removal
- *              $Revision: 64 $
+ *              $Revision: 65 $
  *
  *****************************************************************************/
 
@@ -48,7 +48,7 @@
 
 acpi_status
 acpi_tb_match_signature (
-	NATIVE_CHAR             *signature,
+	char                    *signature,
 	acpi_table_desc         *table_info,
 	u8                      search_type)
 {

drivers/acpi/tables/tbrsdt.c

 /******************************************************************************
  *
  * Module Name: tbrsdt - ACPI RSDT table utilities
- *              $Revision: 4 $
+ *              $Revision: 5 $
  *
  *****************************************************************************/
 
@@ -80,7 +80,7 @@ acpi_tb_verify_rsdp (
 	/*
 	 *  The signature and checksum must both be correct
 	 */
-	if (ACPI_STRNCMP ((NATIVE_CHAR *) rsdp, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
+	if (ACPI_STRNCMP ((char *) rsdp, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
 		/* Nope, BAD Signature */
 
 		status = AE_BAD_SIGNATURE;
@@ -163,7 +163,7 @@ acpi_tb_get_rsdt_address (
 		out_address->pointer.value = acpi_gbl_RSDP->rsdt_physical_address;
 	}
 	else {
-		out_address->pointer.value = ACPI_GET_ADDRESS (acpi_gbl_RSDP->xsdt_physical_address);
+		out_address->pointer.value = acpi_gbl_RSDP->xsdt_physical_address;
 	}
 }
 

drivers/acpi/tables/tbxfroot.c

 /******************************************************************************
  *
  * Module Name: tbxfroot - Find the root ACPI table (RSDT)
- *              $Revision: 66 $
+ *              $Revision: 67 $
  *
  *****************************************************************************/
 
@@ -49,9 +49,9 @@
 
 acpi_status
 acpi_tb_find_table (
-	NATIVE_CHAR             *signature,
-	NATIVE_CHAR             *oem_id,
-	NATIVE_CHAR             *oem_table_id,
+	char                    *signature,
+	char                    *oem_id,
+	char                    *oem_table_id,
 	acpi_table_header       **table_ptr)
 {
 	acpi_status             status;
@@ -173,7 +173,7 @@ acpi_get_firmware_table (
 		/*
 		 *  The signature and checksum must both be correct
 		 */
-		if (ACPI_STRNCMP ((NATIVE_CHAR *) acpi_gbl_RSDP, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
+		if (ACPI_STRNCMP ((char *) acpi_gbl_RSDP, RSDP_SIG, sizeof (RSDP_SIG)-1) != 0) {
 			/* Nope, BAD Signature */
 
 			return_ACPI_STATUS (AE_BAD_SIGNATURE);
@@ -227,8 +227,8 @@ acpi_get_firmware_table (
 			address.pointer.value = ((RSDT_DESCRIPTOR *) rsdt_info.pointer)->table_offset_entry[i];
 		}
 		else {
-			address.pointer.value = ACPI_GET_ADDRESS (
-				((xsdt_descriptor *) rsdt_info.pointer)->table_offset_entry[i]);
+			address.pointer.value =
+				((xsdt_descriptor *) rsdt_info.pointer)->table_offset_entry[i];
 		}
 
 		/* Get the table header */
@@ -346,7 +346,7 @@ acpi_tb_scan_memory_for_rsdp (
 
 		/* The signature and checksum must both be correct */
 
-		if (ACPI_STRNCMP ((NATIVE_CHAR *) mem_rover,
+		if (ACPI_STRNCMP ((char *) mem_rover,
 				RSDP_SIG, sizeof (RSDP_SIG)-1) == 0 &&
 			acpi_tb_checksum (mem_rover, ACPI_RSDP_CHECKSUM_LENGTH) == 0) {
 			/* If so, we have found the RSDP */

drivers/acpi/utilities/utalloc.c

 /******************************************************************************
  *
  * Module Name: utalloc - local cache and memory allocation routines
- *              $Revision: 128 $
+ *              $Revision: 130 $
  *
  *****************************************************************************/
 
@@ -305,10 +305,6 @@ acpi_ut_initialize_buffer (
 		if (buffer->length < required_length) {
 			status = AE_BUFFER_OVERFLOW;
 		}
-
-		/* Clear the buffer */
-
-		ACPI_MEMSET (buffer->pointer, 0, required_length);
 		break;
 	}
 
@@ -336,7 +332,7 @@ void *
 acpi_ut_allocate (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	void                    *allocation;
@@ -386,7 +382,7 @@ void *
 acpi_ut_callocate (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	void                    *allocation;
@@ -451,7 +447,7 @@ void *
 acpi_ut_allocate_and_track (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	acpi_debug_mem_block    *allocation;
@@ -497,7 +493,7 @@ void *
 acpi_ut_callocate_and_track (
 	ACPI_SIZE               size,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	acpi_debug_mem_block    *allocation;
@@ -547,7 +543,7 @@ void
 acpi_ut_free_and_track (
 	void                    *allocation,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	acpi_debug_mem_block    *debug_block;
@@ -652,7 +648,7 @@ acpi_ut_track_allocation (
 	ACPI_SIZE               size,
 	u8                      alloc_type,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	ACPI_MEMORY_LIST        *mem_list;
@@ -735,7 +731,7 @@ acpi_ut_remove_allocation (
 	u32                     list_id,
 	acpi_debug_mem_block    *allocation,
 	u32                     component,
-	NATIVE_CHAR             *module,
+	char                    *module,
 	u32                     line)
 {
 	ACPI_MEMORY_LIST        *mem_list;
@@ -863,7 +859,7 @@ acpi_ut_dump_allocation_info (
 void
 acpi_ut_dump_allocations (
 	u32                     component,
-	NATIVE_CHAR             *module)
+	char                    *module)
 {
 	acpi_debug_mem_block    *element;
 	ACPI_DESCRIPTOR         *descriptor;

drivers/acpi/utilities/utcopy.c

 /******************************************************************************
  *
  * Module Name: utcopy - Internal to external object translation utilities
- *              $Revision: 107 $
+ *              $Revision: 109 $
  *
  *****************************************************************************/
 
@@ -87,7 +87,7 @@ acpi_ut_copy_isimple_to_esimple (
 	switch (ACPI_GET_OBJECT_TYPE (internal_object)) {
 	case ACPI_TYPE_STRING:
 
-		external_object->string.pointer = (NATIVE_CHAR *) data_space;
+		external_object->string.pointer = (char *) data_space;
 		external_object->string.length = internal_object->string.length;
 		*buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD ((ACPI_SIZE) internal_object->string.length + 1);
 

drivers/acpi/utilities/utdebug.c

 /******************************************************************************
  *
  * Module Name: utdebug - Debug print routines
- *              $Revision: 105 $
+ *              $Revision: 106 $
  *
  *****************************************************************************/
 
@@ -288,7 +288,7 @@ void
 acpi_ut_trace_str (
 	u32                     line_number,
 	acpi_debug_print_info   *dbg_info,
-	NATIVE_CHAR             *string)
+	char                    *string)
 {
 
 	acpi_gbl_nesting_level++;

drivers/acpi/utilities/utdelete.c

 /*******************************************************************************
  *
  * Module Name: utdelete - object deletion and reference count utilities
- *              $Revision: 93 $
+ *              $Revision: 94 $
  *
  ******************************************************************************/
 
@@ -74,6 +74,8 @@ acpi_ut_delete_internal_obj (
 		/* Free the actual string buffer */
 
 		if (!(object->common.flags & AOPOBJ_STATIC_POINTER)) {
+			/* But only if it is NOT a pointer into an ACPI table */
+
 			obj_pointer = object->string.pointer;
 		}
 		break;
@@ -86,7 +88,11 @@ acpi_ut_delete_internal_obj (
 
 		/* Free the actual buffer */
 
-		obj_pointer = object->buffer.pointer;
+		if (!(object->common.flags & AOPOBJ_STATIC_POINTER)) {
+			/* But only if it is NOT a pointer into an ACPI table */
+
+			obj_pointer = object->buffer.pointer;
+		}
 		break;
 
 

drivers/acpi/utilities/uteval.c

 /******************************************************************************
  *
  * Module Name: uteval - Object evaluation
- *              $Revision: 42 $
+ *              $Revision: 44 $
  *
  *****************************************************************************/
 
@@ -55,7 +55,7 @@
 acpi_status
 acpi_ut_evaluate_object (
 	acpi_namespace_node     *prefix_node,
-	NATIVE_CHAR             *path,
+	char                    *path,
 	u32                     expected_return_btypes,
 	acpi_operand_object     **return_desc)
 {
@@ -162,7 +162,7 @@ acpi_ut_evaluate_object (
 
 acpi_status
 acpi_ut_evaluate_numeric_object (
-	NATIVE_CHAR             *object_name,
+	char                    *object_name,
 	acpi_namespace_node     *device_node,
 	acpi_integer            *address)
 {

drivers/acpi/utilities/utglobal.c

 /******************************************************************************
  *
  * Module Name: utglobal - Global variables for the ACPI subsystem
- *              $Revision: 176 $
+ *              $Revision: 177 $
  *
  *****************************************************************************/
 
@@ -153,7 +153,7 @@ u8                          acpi_gbl_shutdown = TRUE;
 
 const u8                    acpi_gbl_decode_to8bit [8] = {1,2,4,8,16,32,64,128};
 
-const NATIVE_CHAR           *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT] = {
+const char                  *acpi_gbl_db_sleep_states[ACPI_S_STATE_COUNT] = {
 			  "\\_S0_",
 			  "\\_S1_",
 			  "\\_S2_",
@@ -239,7 +239,7 @@ const u8                        acpi_gbl_ns_properties[] =
 
 /* Hex to ASCII conversion table */
 
-static const NATIVE_CHAR    acpi_gbl_hex_to_ascii[] =
+static const char           acpi_gbl_hex_to_ascii[] =
 			  {'0','1','2','3','4','5','6','7',
 					 '8','9','A','B','C','D','E','F'};
 
@@ -357,7 +357,7 @@ acpi_fixed_event_info       acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 
 /* Region type decoding */
 
-const NATIVE_CHAR *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
+const char        *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
 {
 	"System_memory",
 	"System_iO",
@@ -370,7 +370,7 @@ const NATIVE_CHAR *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] =
 };
 
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_region_name (
 	u8                      space_id)
 {
@@ -385,7 +385,7 @@ acpi_ut_get_region_name (
 		return ("Invalid_space_iD");
 	}
 
-	return ((NATIVE_CHAR *) acpi_gbl_region_types[space_id]);
+	return ((char *) acpi_gbl_region_types[space_id]);
 }
 
 
@@ -403,7 +403,7 @@ acpi_ut_get_region_name (
 
 /* Event type decoding */
 
-static const NATIVE_CHAR *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
+static const char        *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
 {
 	"PM_Timer",
 	"Global_lock",
@@ -413,7 +413,7 @@ static const NATIVE_CHAR *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] =
 };
 
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_event_name (
 	u32                     event_id)
 {
@@ -423,7 +423,7 @@ acpi_ut_get_event_name (
 		return ("Invalid_event_iD");
 	}
 
-	return ((NATIVE_CHAR *) acpi_gbl_event_types[event_id]);
+	return ((char *) acpi_gbl_event_types[event_id]);
 }
 
 
@@ -448,10 +448,10 @@ acpi_ut_get_event_name (
  * indicatewhat type is actually going to be stored for this entry.
  */
 
-static const NATIVE_CHAR    acpi_gbl_bad_type[] = "UNDEFINED";
+static const char           acpi_gbl_bad_type[] = "UNDEFINED";
 #define TYPE_NAME_LENGTH    12                           /* Maximum length of each string */
 
-static const NATIVE_CHAR    *acpi_gbl_ns_type_names[] = /* printable names of ACPI types */
+static const char           *acpi_gbl_ns_type_names[] = /* printable names of ACPI types */
 {
 	/* 00 */ "Untyped",
 	/* 01 */ "Integer",
@@ -486,21 +486,21 @@ static const NATIVE_CHAR    *acpi_gbl_ns_type_names[] = /* printable names of AC
 };
 
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_type_name (
 	acpi_object_type        type)
 {
 
 	if (type > ACPI_TYPE_INVALID)
 	{
-		return ((NATIVE_CHAR *) acpi_gbl_bad_type);
+		return ((char *) acpi_gbl_bad_type);
 	}
 
-	return ((NATIVE_CHAR *) acpi_gbl_ns_type_names[type]);
+	return ((char *) acpi_gbl_ns_type_names[type]);
 }
 
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_object_type_name (
 	acpi_operand_object     *obj_desc)
 {
@@ -533,7 +533,7 @@ acpi_ut_get_object_type_name (
  *
  ****************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ut_get_mutex_name (
 	u32                     mutex_id)
 {

drivers/acpi/utilities/utinit.c

 /******************************************************************************
  *
  * Module Name: utinit - Common ACPI subsystem initialization
- *              $Revision: 114 $
+ *              $Revision: 115 $
  *
  *****************************************************************************/
 
@@ -49,7 +49,7 @@
 
 static void
 acpi_ut_fadt_register_error (
-	NATIVE_CHAR             *register_name,
+	char                    *register_name,
 	u32                     value,
 	ACPI_SIZE               offset)
 {
@@ -92,22 +92,22 @@ acpi_ut_validate_fadt (
 				  ACPI_FADT_OFFSET (pm1_cnt_len));
 	}
 
-	if (!ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xpm1a_evt_blk.address)) {
+	if (!acpi_gbl_FADT->Xpm1a_evt_blk.address) {
 		acpi_ut_fadt_register_error ("X_PM1a_EVT_BLK", 0,
 				  ACPI_FADT_OFFSET (Xpm1a_evt_blk.address));
 	}
 
-	if (!ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xpm1a_cnt_blk.address)) {
+	if (!acpi_gbl_FADT->Xpm1a_cnt_blk.address) {
 		acpi_ut_fadt_register_error ("X_PM1a_CNT_BLK", 0,
 				  ACPI_FADT_OFFSET (Xpm1a_cnt_blk.address));
 	}
 
-	if (!ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xpm_tmr_blk.address)) {
+	if (!acpi_gbl_FADT->Xpm_tmr_blk.address) {
 		acpi_ut_fadt_register_error ("X_PM_TMR_BLK", 0,
 				  ACPI_FADT_OFFSET (Xpm_tmr_blk.address));
 	}
 
-	if ((ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xpm2_cnt_blk.address) &&
+	if ((acpi_gbl_FADT->Xpm2_cnt_blk.address &&
 		!acpi_gbl_FADT->pm2_cnt_len)) {
 		acpi_ut_fadt_register_error ("PM2_CNT_LEN",
 				  (u32) acpi_gbl_FADT->pm2_cnt_len,
@@ -122,14 +122,14 @@ acpi_ut_validate_fadt (
 
 	/* Length of GPE blocks must be a multiple of 2 */
 
-	if (ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xgpe0_blk.address) &&
+	if (acpi_gbl_FADT->Xgpe0_blk.address &&
 		(acpi_gbl_FADT->gpe0_blk_len & 1)) {
 		acpi_ut_fadt_register_error ("(x)GPE0_BLK_LEN",
 				  (u32) acpi_gbl_FADT->gpe0_blk_len,
 				  ACPI_FADT_OFFSET (gpe0_blk_len));
 	}
 
-	if (ACPI_VALID_ADDRESS (acpi_gbl_FADT->Xgpe1_blk.address) &&
+	if (acpi_gbl_FADT->Xgpe1_blk.address &&
 		(acpi_gbl_FADT->gpe1_blk_len & 1)) {
 		acpi_ut_fadt_register_error ("(x)GPE1_BLK_LEN",
 				  (u32) acpi_gbl_FADT->gpe1_blk_len,

drivers/acpi/utilities/utmisc.c

 /*******************************************************************************
  *
  * Module Name: utmisc - common utility procedures
- *              $Revision: 90 $
+ *              $Revision: 92 $
  *
  ******************************************************************************/
 
@@ -283,7 +283,7 @@ u8
 acpi_ut_valid_acpi_name (
 	u32                     name)
 {
-	NATIVE_CHAR             *name_ptr = (NATIVE_CHAR *) &name;
+	char                    *name_ptr = (char *) &name;
 	u32                     i;
 
 
@@ -316,7 +316,7 @@ acpi_ut_valid_acpi_name (
 
 u8
 acpi_ut_valid_acpi_character (
-	NATIVE_CHAR             character)
+	char                    character)
 {
 
 	ACPI_FUNCTION_ENTRY ();
@@ -345,7 +345,7 @@ acpi_ut_valid_acpi_character (
 
 acpi_status
 acpi_ut_strtoul64 (
-	NATIVE_CHAR             *string,
+	char                    *string,
 	u32                     base,
 	acpi_integer            *ret_integer)
 {
@@ -485,11 +485,11 @@ acpi_ut_strtoul64 (
  *
  ******************************************************************************/
 
-NATIVE_CHAR *
+char *
 acpi_ut_strupr (
-	NATIVE_CHAR             *src_string)
+	char                    *src_string)
 {
-	NATIVE_CHAR             *string;
+	char                    *string;
 
 
 	ACPI_FUNCTION_ENTRY ();
@@ -1420,7 +1420,7 @@ acpi_ut_get_resource_end_tag (
 
 void
 acpi_ut_report_error (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id)
 {
@@ -1447,7 +1447,7 @@ acpi_ut_report_error (
 
 void
 acpi_ut_report_warning (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id)
 {
@@ -1473,7 +1473,7 @@ acpi_ut_report_warning (
 
 void
 acpi_ut_report_info (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id)
 {

drivers/acpi/utilities/utobject.c

 /******************************************************************************
  *
  * Module Name: utobject - ACPI object create/delete/size/cache routines
- *              $Revision: 79 $
+ *              $Revision: 81 $
  *
  *****************************************************************************/
 
@@ -56,7 +56,7 @@
 
 acpi_operand_object  *
 acpi_ut_create_internal_object_dbg (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id,
 	acpi_object_type        type)
@@ -248,7 +248,7 @@ acpi_ut_valid_internal_object (
 
 void *
 acpi_ut_allocate_object_desc_dbg (
-	NATIVE_CHAR             *module_name,
+	char                    *module_name,
 	u32                     line_number,
 	u32                     component_id)
 {