Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

bc535154 · Linus Torvalds <[email protected]> · 2010-03-01 10:36:22 -08:00

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: replace acpi_integer by u64
  ACPICA: Update version to 20100121.
  ACPICA: Remove unused uint32_struct type
  ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
  ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
  ACPICA: Predefined name repair: fix NULL package elements
  ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
  ACPICA: Update all ACPICA copyrights and signons to 2010
  ACPICA: Update for new gcc-4 warning options

Commit: bc535154137601400ffe44c2a7be047ca041fe06
Parents: d03ab7ff · 439913ff

Merge commit. Changes below are compared with the first parent: d03ab7ff.

Changes

167 files changed · +721 −603

File	Status	Add	Del	Content
arch/ia64/hp/common/aml_nfw.c	modified	+3	−3	View file
arch/x86/kernel/cpu/cpufreq/powernow-k8.c	modified	+3	−3	View file
drivers/acpi/acpica/accommon.h	modified	+1	−1	View file
drivers/acpi/acpica/acconfig.h	modified	+1	−1	View file
drivers/acpi/acpica/acdebug.h	modified	+1	−1	View file
drivers/acpi/acpica/acdispat.h	modified	+1	−1	View file
drivers/acpi/acpica/acevents.h	modified	+2	−3	View file
drivers/acpi/acpica/acglobal.h	modified	+1	−1	View file
drivers/acpi/acpica/achware.h	modified	+1	−1	View file
drivers/acpi/acpica/acinterp.h	modified	+20	−24	View file
drivers/acpi/acpica/aclocal.h	modified	+3	−3	View file
drivers/acpi/acpica/acmacros.h	modified	+7	−7	View file
drivers/acpi/acpica/acnamesp.h	modified	+12	−6	View file
drivers/acpi/acpica/acobject.h	modified	+2	−2	View file
drivers/acpi/acpica/acopcode.h	modified	+1	−1	View file
drivers/acpi/acpica/acparser.h	modified	+1	−1	View file
drivers/acpi/acpica/acpredef.h	modified	+1	−1	View file
drivers/acpi/acpica/acresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/acstruct.h	modified	+1	−1	View file
drivers/acpi/acpica/actables.h	modified	+1	−1	View file
drivers/acpi/acpica/acutils.h	modified	+9	−13	View file
drivers/acpi/acpica/amlcode.h	modified	+1	−1	View file
drivers/acpi/acpica/amlresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/dsfield.c	modified	+6	−6	View file
drivers/acpi/acpica/dsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/dsmethod.c	modified	+1	−1	View file
drivers/acpi/acpica/dsmthdat.c	modified	+1	−1	View file
drivers/acpi/acpica/dsobject.c	modified	+2	−2	View file
drivers/acpi/acpica/dsopcode.c	modified	+1	−1	View file
drivers/acpi/acpica/dsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/dswexec.c	modified	+1	−1	View file
drivers/acpi/acpica/dswload.c	modified	+1	−1	View file
drivers/acpi/acpica/dswscope.c	modified	+1	−1	View file
drivers/acpi/acpica/dswstate.c	modified	+1	−1	View file
drivers/acpi/acpica/evevent.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpe.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeblk.c	modified	+1	−1	View file
drivers/acpi/acpica/evmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/evregion.c	modified	+3	−4	View file
drivers/acpi/acpica/evrgnini.c	modified	+2	−2	View file
drivers/acpi/acpica/evsci.c	modified	+1	−1	View file
drivers/acpi/acpica/evxface.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfevnt.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfregn.c	modified	+1	−1	View file
drivers/acpi/acpica/exconfig.c	modified	+7	−10	View file
drivers/acpi/acpica/exconvrt.c	modified	+9	−12	View file
drivers/acpi/acpica/excreate.c	modified	+1	−1	View file
drivers/acpi/acpica/exdump.c	modified	+1	−1	View file
drivers/acpi/acpica/exfield.c	modified	+4	−5	View file
drivers/acpi/acpica/exfldio.c	modified	+27	−32	View file
drivers/acpi/acpica/exmisc.c	modified	+5	−7	View file
drivers/acpi/acpica/exmutex.c	modified	+1	−1	View file
drivers/acpi/acpica/exnames.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg1.c	modified	+8	−8	View file
drivers/acpi/acpica/exoparg2.c	modified	+3	−3	View file
drivers/acpi/acpica/exoparg3.c	modified	+2	−2	View file
drivers/acpi/acpica/exoparg6.c	modified	+5	−5	View file
drivers/acpi/acpica/exprep.c	modified	+1	−1	View file
drivers/acpi/acpica/exregion.c	modified	+16	−19	View file
drivers/acpi/acpica/exresnte.c	modified	+1	−1	View file
drivers/acpi/acpica/exresolv.c	modified	+1	−1	View file
drivers/acpi/acpica/exresop.c	modified	+1	−1	View file
drivers/acpi/acpica/exstore.c	modified	+1	−1	View file
drivers/acpi/acpica/exstoren.c	modified	+1	−1	View file
drivers/acpi/acpica/exstorob.c	modified	+1	−1	View file
drivers/acpi/acpica/exsystem.c	modified	+2	−2	View file
drivers/acpi/acpica/exutils.c	modified	+12	−12	View file
drivers/acpi/acpica/hwacpi.c	modified	+1	−1	View file
drivers/acpi/acpica/hwgpe.c	modified	+3	−5	View file
drivers/acpi/acpica/hwregs.c	modified	+1	−1	View file
drivers/acpi/acpica/hwsleep.c	modified	+1	−1	View file
drivers/acpi/acpica/hwtimer.c	modified	+2	−2	View file
drivers/acpi/acpica/hwvalid.c	modified	+1	−1	View file
drivers/acpi/acpica/hwxface.c	modified	+1	−1	View file
drivers/acpi/acpica/nsaccess.c	modified	+1	−1	View file
drivers/acpi/acpica/nsalloc.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdump.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdumpdv.c	modified	+1	−1	View file
drivers/acpi/acpica/nseval.c	modified	+1	−1	View file
drivers/acpi/acpica/nsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/nsload.c	modified	+1	−1	View file
drivers/acpi/acpica/nsnames.c	modified	+1	−1	View file
drivers/acpi/acpica/nsobject.c	modified	+1	−1	View file
drivers/acpi/acpica/nsparse.c	modified	+1	−1	View file
drivers/acpi/acpica/nspredef.c	modified	+36	−17	View file
drivers/acpi/acpica/nsrepair.c	modified	+174	−1	View file
drivers/acpi/acpica/nsrepair2.c	modified	+10	−100	View file
drivers/acpi/acpica/nssearch.c	modified	+1	−1	View file
drivers/acpi/acpica/nsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/nswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfeval.c	modified	+34	−20	View file
drivers/acpi/acpica/nsxfname.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfobj.c	modified	+1	−1	View file
drivers/acpi/acpica/psargs.c	modified	+2	−2	View file
drivers/acpi/acpica/psloop.c	modified	+1	−1	View file
drivers/acpi/acpica/psopcode.c	modified	+1	−1	View file
drivers/acpi/acpica/psparse.c	modified	+1	−1	View file
drivers/acpi/acpica/psscope.c	modified	+1	−1	View file
drivers/acpi/acpica/pstree.c	modified	+1	−1	View file
drivers/acpi/acpica/psutils.c	modified	+1	−1	View file
drivers/acpi/acpica/pswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/psxface.c	modified	+1	−1	View file
drivers/acpi/acpica/rsaddr.c	modified	+1	−1	View file
drivers/acpi/acpica/rscalc.c	modified	+1	−1	View file
drivers/acpi/acpica/rscreate.c	modified	+2	−2	View file
drivers/acpi/acpica/rsdump.c	modified	+1	−1	View file
drivers/acpi/acpica/rsinfo.c	modified	+1	−1	View file
drivers/acpi/acpica/rsio.c	modified	+1	−1	View file
drivers/acpi/acpica/rsirq.c	modified	+1	−1	View file
drivers/acpi/acpica/rslist.c	modified	+1	−1	View file
drivers/acpi/acpica/rsmemory.c	modified	+1	−1	View file
drivers/acpi/acpica/rsmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/rsutils.c	modified	+1	−1	View file
drivers/acpi/acpica/rsxface.c	modified	+1	−1	View file
drivers/acpi/acpica/tbfadt.c	modified	+1	−1	View file
drivers/acpi/acpica/tbfind.c	modified	+1	−1	View file
drivers/acpi/acpica/tbinstal.c	modified	+1	−1	View file
drivers/acpi/acpica/tbutils.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxface.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxfroot.c	modified	+1	−1	View file
drivers/acpi/acpica/utalloc.c	modified	+1	−1	View file
drivers/acpi/acpica/utcopy.c	modified	+1	−1	View file
drivers/acpi/acpica/utdebug.c	modified	+2	−3	View file
drivers/acpi/acpica/utdelete.c	modified	+1	−1	View file
drivers/acpi/acpica/uteval.c	modified	+2	−2	View file
drivers/acpi/acpica/utglobal.c	modified	+2	−2	View file
drivers/acpi/acpica/utids.c	modified	+1	−1	View file
drivers/acpi/acpica/utinit.c	modified	+1	−1	View file
drivers/acpi/acpica/utlock.c	modified	+1	−1	View file
drivers/acpi/acpica/utmath.c	modified	+11	−16	View file
drivers/acpi/acpica/utmisc.c	modified	+7	−9	View file
drivers/acpi/acpica/utmutex.c	modified	+4	−14	View file
drivers/acpi/acpica/utobject.c	modified	+1	−1	View file
drivers/acpi/acpica/utresrc.c	modified	+1	−1	View file
drivers/acpi/acpica/utstate.c	modified	+1	−1	View file
drivers/acpi/acpica/utxface.c	modified	+1	−1	View file
drivers/acpi/battery.c	modified	+2	−2	View file
drivers/acpi/ec.c	modified	+2	−2	View file
drivers/acpi/glue.c	modified	+2	−2	View file
drivers/acpi/osl.c	modified	+2	−2	View file
drivers/acpi/power_meter.c	modified	+15	−15	View file
drivers/acpi/processor_idle.c	modified	+1	−1	View file
drivers/acpi/processor_throttling.c	modified	+12	−12	View file
drivers/acpi/utils.c	modified	+8	−8	View file
drivers/acpi/video.c	modified	+1	−1	View file
drivers/ata/libata-acpi.c	modified	+2	−2	View file
drivers/ide/ide-acpi.c	modified	+4	−4	View file
drivers/input/misc/atlas_btns.c	modified	+1	−1	View file
drivers/pci/pci-acpi.c	modified	+1	−1	View file
drivers/platform/x86/toshiba_bluetooth.c	modified	+2	−2	View file
drivers/platform/x86/wmi.c	modified	+2	−2	View file
include/acpi/acexcep.h	modified	+1	−1	View file
include/acpi/acnames.h	modified	+1	−1	View file
include/acpi/acoutput.h	modified	+1	−1	View file
include/acpi/acpi.h	modified	+1	−1	View file
include/acpi/acpi_bus.h	modified	+3	−3	View file
include/acpi/acpiosxf.h	modified	+3	−3	View file
include/acpi/acpixf.h	modified	+2	−2	View file
include/acpi/acrestyp.h	modified	+2	−2	View file
include/acpi/actbl.h	modified	+1	−1	View file
include/acpi/actbl1.h	modified	+1	−1	View file
include/acpi/actbl2.h	modified	+43	−0	View file
include/acpi/actypes.h	modified	+17	−17	View file
include/acpi/platform/acenv.h	modified	+3	−3	View file
include/acpi/platform/acgcc.h	modified	+1	−1	View file
include/acpi/platform/aclinux.h	modified	+1	−1	View file
include/acpi/processor.h	modified	+21	−21	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/ia64/hp/common/aml_nfw.c

View file

diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c
index 4abd2c7..2207848 100644
--- a/arch/ia64/hp/common/aml_nfw.c
+++ b/arch/ia64/hp/common/aml_nfw.c
@@ -77,7 +77,7 @@ static void aml_nfw_execute(struct ia64_nfw_context *c)
 		     c->arg[4], c->arg[5], c->arg[6], c->arg[7]);
 }
 
-static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value)
+static void aml_nfw_read_arg(u8 *offset, u32 bit_width, u64 *value)
 {
 	switch (bit_width) {
 	case 8:
@@ -95,7 +95,7 @@ static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value)
 	}
 }
 
-static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value)
+static void aml_nfw_write_arg(u8 *offset, u32 bit_width, u64 *value)
 {
 	switch (bit_width) {
 	case 8:
@@ -114,7 +114,7 @@ static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value)
 }
 
 static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address,
-	u32 bit_width, acpi_integer *value, void *handler_context,
+	u32 bit_width, u64 *value, void *handler_context,
 	void *region_context)
 {
 	struct ia64_nfw_context *context = handler_context;

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

View file

diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 6e44519..d360b56 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -806,7 +806,7 @@ static int find_psb_table(struct powernow_k8_data *data)
 static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data,
 		unsigned int index)
 {
-	acpi_integer control;
+	u64 control;
 
 	if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))
 		return;
@@ -824,7 +824,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
 {
 	struct cpufreq_frequency_table *powernow_table;
 	int ret_val = -ENODEV;
-	acpi_integer control, status;
+	u64 control, status;
 
 	if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {
 		dprintk("register performance failed: bad ACPI data\n");
@@ -948,7 +948,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data,
 		u32 fid;
 		u32 vid;
 		u32 freq, index;
-		acpi_integer status, control;
+		u64 status, control;
 
 		if (data->exttype) {
 			status =  data->acpi_data.states[i].status;

drivers/acpi/acpica/accommon.h

View file

diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 3b20786..3e50c74 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acconfig.h

View file

diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index a4471e3..33181ad 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

View file

diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index a4fb001..48faf3e 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdispat.h

View file

diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 6291904..894a0ff 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acevents.h

View file

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 4ced54f..3e6ba99 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -133,8 +133,7 @@ acpi_status acpi_ev_initialize_op_regions(void);
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 			       u32 function,
-			       u32 region_offset,
-			       u32 bit_width, acpi_integer * value);
+			       u32 region_offset, u32 bit_width, u64 *value);
 
 acpi_status
 acpi_ev_attach_region(union acpi_operand_object *handler_obj,

drivers/acpi/acpica/acglobal.h

View file

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 29ba66d..f8dd8f2 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/achware.h

View file

diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 36192f1..5900f13 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acinterp.h

View file

diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 5db9f29..6df3f84 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -129,18 +129,17 @@ acpi_ex_common_buffer_setup(union acpi_operand_object *obj_desc,
 
 acpi_status
 acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
-			       acpi_integer mask,
-			       acpi_integer field_value,
-			       u32 field_datum_byte_offset);
+			       u64 mask,
+			       u64 field_value, u32 field_datum_byte_offset);
 
 void
-acpi_ex_get_buffer_datum(acpi_integer * datum,
+acpi_ex_get_buffer_datum(u64 *datum,
 			 void *buffer,
 			 u32 buffer_length,
 			 u32 byte_granularity, u32 buffer_offset);
 
 void
-acpi_ex_set_buffer_datum(acpi_integer merged_datum,
+acpi_ex_set_buffer_datum(u64 merged_datum,
 			 void *buffer,
 			 u32 buffer_length,
 			 u32 byte_granularity, u32 buffer_offset);
@@ -168,8 +167,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
 acpi_status
 acpi_ex_access_region(union acpi_operand_object *obj_desc,
-		      u32 field_datum_byte_offset,
-		      acpi_integer * value, u32 read_write);
+		      u32 field_datum_byte_offset, u64 *value, u32 read_write);
 
 /*
  * exmisc - misc support routines
@@ -193,16 +191,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *obj_desc,
 
 acpi_status
 acpi_ex_do_logical_numeric_op(u16 opcode,
-			      acpi_integer integer0,
-			      acpi_integer integer1, u8 * logical_result);
+			      u64 integer0, u64 integer1, u8 *logical_result);
 
 acpi_status
 acpi_ex_do_logical_op(u16 opcode,
 		      union acpi_operand_object *operand0,
-		      union acpi_operand_object *operand1, u8 * logical_result);
+		      union acpi_operand_object *operand1, u8 *logical_result);
 
-acpi_integer
-acpi_ex_do_math_op(u16 opcode, acpi_integer operand0, acpi_integer operand1);
+u64 acpi_ex_do_math_op(u16 opcode, u64 operand0, u64 operand1);
 
 acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state);
 
@@ -278,7 +274,7 @@ acpi_status
 acpi_ex_system_do_notify_op(union acpi_operand_object *value,
 			    union acpi_operand_object *obj_desc);
 
-acpi_status acpi_ex_system_do_suspend(acpi_integer time);
+acpi_status acpi_ex_system_do_suspend(u64 time);
 
 acpi_status acpi_ex_system_do_stall(u32 time);
 
@@ -461,9 +457,9 @@ void acpi_ex_acquire_global_lock(u32 rule);
 
 void acpi_ex_release_global_lock(u32 rule);
 
-void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id);
+void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
 
-void acpi_ex_integer_to_string(char *dest, acpi_integer value);
+void acpi_ex_integer_to_string(char *dest, u64 value);
 
 /*
  * exregion - default op_region handlers
@@ -472,7 +468,7 @@ acpi_status
 acpi_ex_system_memory_space_handler(u32 function,
 				    acpi_physical_address address,
 				    u32 bit_width,
-				    acpi_integer * value,
+				    u64 *value,
 				    void *handler_context,
 				    void *region_context);
 
@@ -480,35 +476,35 @@ acpi_status
 acpi_ex_system_io_space_handler(u32 function,
 				acpi_physical_address address,
 				u32 bit_width,
-				acpi_integer * value,
+				u64 *value,
 				void *handler_context, void *region_context);
 
 acpi_status
 acpi_ex_pci_config_space_handler(u32 function,
 				 acpi_physical_address address,
 				 u32 bit_width,
-				 acpi_integer * value,
+				 u64 *value,
 				 void *handler_context, void *region_context);
 
 acpi_status
 acpi_ex_cmos_space_handler(u32 function,
 			   acpi_physical_address address,
 			   u32 bit_width,
-			   acpi_integer * value,
+			   u64 *value,
 			   void *handler_context, void *region_context);
 
 acpi_status
 acpi_ex_pci_bar_space_handler(u32 function,
 			      acpi_physical_address address,
 			      u32 bit_width,
-			      acpi_integer * value,
+			      u64 *value,
 			      void *handler_context, void *region_context);
 
 acpi_status
 acpi_ex_embedded_controller_space_handler(u32 function,
 					  acpi_physical_address address,
 					  u32 bit_width,
-					  acpi_integer * value,
+					  u64 *value,
 					  void *handler_context,
 					  void *region_context);
 
@@ -516,14 +512,14 @@ acpi_status
 acpi_ex_sm_bus_space_handler(u32 function,
 			     acpi_physical_address address,
 			     u32 bit_width,
-			     acpi_integer * value,
+			     u64 *value,
 			     void *handler_context, void *region_context);
 
 acpi_status
 acpi_ex_data_table_space_handler(u32 function,
 				 acpi_physical_address address,
 				 u32 bit_width,
-				 acpi_integer * value,
+				 u64 *value,
 				 void *handler_context, void *region_context);
 
 #endif				/* __INTERP_H__ */

drivers/acpi/acpica/aclocal.h

View file

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 13cb80c..24b8faa 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -374,6 +374,7 @@ union acpi_predefined_info {
 struct acpi_predefined_data {
 	char *pathname;
 	const union acpi_predefined_info *predefined;
+	union acpi_operand_object *parent_package;
 	u32 flags;
 	u8 node_flags;
 };
@@ -651,8 +652,7 @@ struct acpi_opcode_info {
 };
 
 union acpi_parse_value {
-	acpi_integer integer;	/* Integer constant (Up to 64 bits) */
-	struct uint64_struct integer64;	/* Structure overlay for 2 32-bit Dwords */
+	u64 integer;		/* Integer constant (Up to 64 bits) */
 	u32 size;		/* bytelist or field size */
 	char *string;		/* NULL terminated string */
 	u8 *buffer;		/* buffer or string */

drivers/acpi/acpica/acmacros.h

View file

diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 7d9ba6e..9894929 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -272,8 +272,8 @@
  * MASK_BITS_ABOVE creates a mask starting AT the position and above
  * MASK_BITS_BELOW creates a mask starting one bit BELOW the position
  */
-#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_INTEGER_MAX) << ((u32) (position))))
-#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_INTEGER_MAX) << ((u32) (position)))
+#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_UINT64_MAX) << ((u32) (position))))
+#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_UINT64_MAX) << ((u32) (position)))
 
 /* Bitfields within ACPI registers */
 
@@ -414,16 +414,16 @@
 											acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) _s); \
 											return (_s); })
 #define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
-											register acpi_integer _s = (s); \
+											register u64 _s = (s); \
 											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, _s); \
 											return (_s); })
 #define return_UINT8(s)                 ACPI_DO_WHILE0 ({ \
 											register u8 _s = (u8) (s); \
-											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
 											return (_s); })
 #define return_UINT32(s)                ACPI_DO_WHILE0 ({ \
 											register u32 _s = (u32) (s); \
-											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
 											return (_s); })
 #else				/* Use original less-safe macros */
 
@@ -434,7 +434,7 @@
 											acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) (s)); \
 											return((s)); })
 #define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
-											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) (s)); \
+											acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) (s)); \
 											return((s)); })
 #define return_UINT8(s)                 return_VALUE(s)
 #define return_UINT32(s)                return_VALUE(s)

drivers/acpi/acpica/acnamesp.h

View file

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 61edb15..258159c 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286,6 +286,17 @@ acpi_status
 acpi_ns_repair_package_list(struct acpi_predefined_data *data,
 			    union acpi_operand_object **obj_desc_ptr);
 
+acpi_status
+acpi_ns_repair_null_element(struct acpi_predefined_data *data,
+			    u32 expected_btypes,
+			    u32 package_index,
+			    union acpi_operand_object **return_object_ptr);
+
+void
+acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
+			     u8 package_type,
+			     union acpi_operand_object *obj_desc);
+
 /*
  * nsrepair2 - Return object repair for specific
  * predefined methods/objects
@@ -296,11 +307,6 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
 			acpi_status validate_status,
 			union acpi_operand_object **return_object_ptr);
 
-void
-acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
-			     u8 package_type,
-			     union acpi_operand_object *obj_desc);
-
 /*
  * nssearch - Namespace searching and entry
  */

drivers/acpi/acpica/acobject.h

View file

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 07f6e2e..cde18ea 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,7 @@ ACPI_OBJECT_COMMON_HEADER};
 
 struct acpi_object_integer {
 	ACPI_OBJECT_COMMON_HEADER u8 fill[3];	/* Prevent warning on some compilers */
-	acpi_integer value;
+	u64 value;
 };
 
 /*

drivers/acpi/acpica/acopcode.h

View file

diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index dfdf633..8c15ff4 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acparser.h

View file

diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 22881e8..d0bb0fd 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acpredef.h

View file

diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 57bdaf6..9711608 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acresrc.h

View file

diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index eef5bd7..528bcba 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acstruct.h

View file

diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 7980a26..161bc0e 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/actables.h

View file

diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 01c76b8..8ff3b74 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acutils.h

View file

diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 3a451a2..35df755 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -134,7 +134,7 @@ char *acpi_ut_get_region_name(u8 space_id);
 
 char *acpi_ut_get_event_name(u32 event_id);
 
-char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position);
+char acpi_ut_hex_to_ascii_char(u64 integer, u32 position);
 
 u8 acpi_ut_valid_object_type(acpi_object_type type);
 
@@ -279,8 +279,7 @@ acpi_ut_status_exit(u32 line_number,
 void
 acpi_ut_value_exit(u32 line_number,
 		   const char *function_name,
-		   const char *module_name,
-		   u32 component_id, acpi_integer value);
+		   const char *module_name, u32 component_id, u64 value);
 
 void
 acpi_ut_ptr_exit(u32 line_number,
@@ -324,7 +323,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
 				struct acpi_namespace_node *device_node,
-				acpi_integer *value);
+				u64 *value);
 
 acpi_status
 acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 *status_flags);
@@ -437,14 +436,12 @@ void acpi_ut_delete_generic_state(union acpi_generic_state *state);
  * utmath
  */
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
-	       acpi_integer in_divisor,
-	       acpi_integer * out_quotient, acpi_integer * out_remainder);
+acpi_ut_divide(u64 in_dividend,
+	       u64 in_divisor, u64 *out_quotient, u64 *out_remainder);
 
 acpi_status
-acpi_ut_short_divide(acpi_integer in_dividend,
-		     u32 divisor,
-		     acpi_integer * out_quotient, u32 * out_remainder);
+acpi_ut_short_divide(u64 in_dividend,