Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-merge-2.6

4314652b · Linus Torvalds <[email protected]> · 2008-07-16 14:52:12 -07:00

* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-merge-2.6: (87 commits)
  Fix FADT parsing
  Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
  ACPI: use dev_printk when possible
  PNPACPI: add support for HP vendor-specific CCSR descriptors
  PNP: avoid legacy IDE IRQs
  PNP: convert resource options to single linked list
  ISAPNP: handle independent options following dependent ones
  PNP: remove extra 0x100 bit from option priority
  PNP: support optional IRQ resources
  PNP: rename pnp_register_*_resource() local variables
  PNPACPI: ignore _PRS interrupt numbers larger than PNP_IRQ_NR
  PNP: centralize resource option allocations
  PNP: remove redundant pnp_can_configure() check
  PNP: make resource assignment functions return 0 (success) or -EBUSY (failure)
  PNP: in debug resource dump, make empty list obvious
  PNP: improve resource assignment debug
  PNP: increase I/O port & memory option address sizes
  PNP: introduce pnp_irq_mask_t typedef
  PNP: make resource option structures private to PNP subsystem
  PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM
  ...

Commit: 4314652bb41df08ad65bd25176ba1dfd24b14a51
Parents: d442cc44 · 01a5bba5

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

Changes

128 files changed · +4330 −2449

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-firmware-acpi	modified	+87	−40	View file
Documentation/kernel-parameters.txt	modified	+4	−1	View file
Documentation/laptops/acer-wmi.txt	modified	+0	−2	View file
MAINTAINERS	modified	+18	−7	View file
arch/ia64/kernel/process.c	modified	+4	−0	View file
arch/x86/kernel/acpi/processor.c	modified	+6	−0	View file
arch/x86/kernel/process.c	modified	+27	−1	View file
arch/x86/mm/srat_32.c	modified	+1	−2	View file
drivers/acpi/Makefile	modified	+1	−1	View file
drivers/acpi/bay.c	modified	+3	−0	View file
drivers/acpi/bus.c	modified	+1	−1	View file
drivers/acpi/dispatcher/dsinit.c	modified	+1	−1	View file
drivers/acpi/dispatcher/dsmethod.c	modified	+0	−1	View file
drivers/acpi/dispatcher/dsopcode.c	modified	+3	−19	View file
drivers/acpi/dispatcher/dswexec.c	modified	+0	−8	View file
drivers/acpi/dispatcher/dswstate.c	modified	+7	−13	View file
drivers/acpi/dock.c	modified	+3	−0	View file
drivers/acpi/events/evevent.c	modified	+3	−3	View file
drivers/acpi/events/evgpe.c	modified	+18	−18	View file
drivers/acpi/events/evgpeblk.c	modified	+10	−8	View file
drivers/acpi/events/evmisc.c	modified	+2	−2	View file
drivers/acpi/events/evregion.c	modified	+2	−3	View file
drivers/acpi/events/evrgnini.c	modified	+1	−1	View file
drivers/acpi/events/evxfevnt.c	modified	+15	−3	View file
drivers/acpi/executer/exconfig.c	modified	+9	−8	View file
drivers/acpi/executer/exconvrt.c	modified	+6	−6	View file
drivers/acpi/executer/excreate.c	modified	+0	−2	View file
drivers/acpi/executer/exdump.c	modified	+26	−41	View file
drivers/acpi/executer/exfldio.c	modified	+5	−4	View file
drivers/acpi/executer/exmisc.c	modified	+4	−4	View file
drivers/acpi/executer/exprep.c	modified	+4	−4	View file
drivers/acpi/executer/exregion.c	modified	+1	−1	View file
drivers/acpi/executer/exresop.c	modified	+4	−0	View file
drivers/acpi/executer/exstore.c	modified	+0	−6	View file
drivers/acpi/fan.c	modified	+7	−1	View file
drivers/acpi/glue.c	modified	+3	−0	View file
drivers/acpi/hardware/hwgpe.c	modified	+49	−3	View file
drivers/acpi/namespace/nsdump.c	modified	+3	−3	View file
drivers/acpi/namespace/nseval.c	modified	+35	−0	View file
drivers/acpi/namespace/nsinit.c	modified	+0	−1	View file
drivers/acpi/namespace/nsload.c	modified	+1	−2	View file
drivers/acpi/namespace/nsparse.c	modified	+7	−8	View file
drivers/acpi/namespace/nsutils.c	modified	+25	−25	View file
drivers/acpi/namespace/nsxfeval.c	modified	+1	−2	View file
drivers/acpi/numa.c	modified	+2	−2	View file
drivers/acpi/parser/psargs.c	modified	+2	−2	View file
drivers/acpi/parser/psxface.c	modified	+2	−2	View file
drivers/acpi/pci_irq.c	modified	+17	−21	View file
drivers/acpi/processor_core.c	modified	+60	−15	View file
drivers/acpi/processor_idle.c	modified	+30	−4	View file
drivers/acpi/processor_perflib.c	modified	+9	−9	View file
drivers/acpi/processor_throttling.c	modified	+27	−11	View file
drivers/acpi/reboot.c	added	+50	−0	View file
drivers/acpi/resources/rscalc.c	modified	+2	−2	View file
drivers/acpi/resources/rscreate.c	modified	+29	−12	View file
drivers/acpi/resources/rsmisc.c	modified	+1	−1	View file
drivers/acpi/resources/rsutils.c	modified	+6	−7	View file
drivers/acpi/scan.c	modified	+37	−25	View file
drivers/acpi/sleep/main.c	modified	+4	−35	View file
drivers/acpi/system.c	modified	+156	−13	View file
drivers/acpi/tables/tbfadt.c	modified	+14	−9	View file
drivers/acpi/tables/tbfind.c	modified	+2	−3	View file
drivers/acpi/tables/tbinstal.c	modified	+14	−16	View file
drivers/acpi/tables/tbutils.c	modified	+7	−8	View file
drivers/acpi/tables/tbxface.c	modified	+13	−15	View file
drivers/acpi/tables/tbxfroot.c	modified	+2	−2	View file
drivers/acpi/utilities/utalloc.c	modified	+3	−2	View file
drivers/acpi/utilities/utcopy.c	modified	+2	−2	View file
drivers/acpi/utilities/utdebug.c	modified	+33	−21	View file
drivers/acpi/utilities/utdelete.c	modified	+1	−1	View file
drivers/acpi/utilities/uteval.c	modified	+2	−3	View file
drivers/acpi/utilities/utmisc.c	modified	+18	−21	View file
drivers/acpi/utilities/utmutex.c	modified	+2	−2	View file
drivers/acpi/utilities/utobject.c	modified	+5	−4	View file
drivers/acpi/video.c	modified	+73	−50	View file
drivers/char/apm-emulation.c	modified	+207	−139	View file
drivers/misc/Kconfig	modified	+30	−1	View file
drivers/misc/Makefile	modified	+3	−2	View file
drivers/misc/acer-wmi.c	modified	+135	−10	View file
drivers/misc/compal-laptop.c	added	+404	−0	View file
drivers/misc/eeepc-laptop.c	modified	+2	−2	View file
drivers/misc/fujitsu-laptop.c	modified	+774	−51	View file
drivers/pci/pci-acpi.c	modified	+2	−4	View file
drivers/pci/pci.c	modified	+2	−2	View file
drivers/pci/pci.h	modified	+1	−2	View file
drivers/pnp/base.h	modified	+119	−29	View file
drivers/pnp/core.c	modified	+19	−10	View file
drivers/pnp/interface.c	modified	+89	−118	View file
drivers/pnp/isapnp/core.c	modified	+97	−156	View file
drivers/pnp/manager.c	modified	+131	−283	View file
drivers/pnp/pnpacpi/core.c	modified	+1	−3	View file
drivers/pnp/pnpacpi/rsparser.c	modified	+287	−205	View file
drivers/pnp/pnpbios/rsparser.c	modified	+146	−128	View file
drivers/pnp/quirks.c	modified	+156	−151	View file
drivers/pnp/resource.c	modified	+203	−251	View file
drivers/pnp/support.c	modified	+146	−25	View file
drivers/pnp/system.c	modified	+2	−2	View file
drivers/serial/8250_pnp.c	modified	+7	−17	View file
include/acpi/acconfig.h	modified	+1	−1	View file
include/acpi/acdisasm.h	modified	+1	−0	View file
include/acpi/acdispat.h	modified	+1	−1	View file
include/acpi/acexcep.h	modified	+8	−2	View file
include/acpi/acglobal.h	modified	+1	−1	View file
include/acpi/achware.h	modified	+2	−2	View file
include/acpi/acinterp.h	modified	+1	−4	View file
include/acpi/aclocal.h	modified	+3	−3	View file
include/acpi/acmacros.h	modified	+18	−20	View file
include/acpi/acnamesp.h	modified	+15	−15	View file
include/acpi/acpi_bus.h	modified	+2	−2	View file
include/acpi/acpiosxf.h	modified	+1	−1	View file
include/acpi/acpixf.h	modified	+4	−8	View file
include/acpi/acstruct.h	modified	+2	−8	View file
include/acpi/actables.h	modified	+12	−15	View file
include/acpi/actbl1.h	modified	+21	−2	View file
include/acpi/actypes.h	modified	+6	−10	View file
include/acpi/acutils.h	modified	+40	−30	View file
include/acpi/processor.h	modified	+1	−1	View file
include/acpi/reboot.h	modified	+8	−6	View file
include/asm-ia64/processor.h	modified	+2	−0	View file
include/asm-x86/processor.h	modified	+2	−0	View file
include/linux/freezer.h	modified	+10	−0	View file
include/linux/ioport.h	modified	+5	−0	View file
include/linux/pnp.h	modified	+78	−68	View file
include/linux/sched.h	modified	+1	−0	View file
kernel/cpu.c	modified	+1	−0	View file
kernel/kthread.c	modified	+1	−1	View file
kernel/power/process.c	modified	+42	−55	View file
kernel/power/user.c	modified	+45	−26	View file

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

Documentation/ABI/testing/sysfs-firmware-acpi

View file

diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
index 9470ed9..f27be7d 100644
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -29,46 +29,46 @@ Description:
 
 		$ cd /sys/firmware/acpi/interrupts
 		$ grep . *
-		error:0
-		ff_gbl_lock:0
-		ff_pmtimer:0
-		ff_pwr_btn:0
-		ff_rt_clk:0
-		ff_slp_btn:0
-		gpe00:0
-		gpe01:0
-		gpe02:0
-		gpe03:0
-		gpe04:0
-		gpe05:0
-		gpe06:0
-		gpe07:0
-		gpe08:0
-		gpe09:174
-		gpe0A:0
-		gpe0B:0
-		gpe0C:0
-		gpe0D:0
-		gpe0E:0
-		gpe0F:0
-		gpe10:0
-		gpe11:60
-		gpe12:0
-		gpe13:0
-		gpe14:0
-		gpe15:0
-		gpe16:0
-		gpe17:0
-		gpe18:0
-		gpe19:7
-		gpe1A:0
-		gpe1B:0
-		gpe1C:0
-		gpe1D:0
-		gpe1E:0
-		gpe1F:0
-		gpe_all:241
-		sci:241
+		error:	     0
+		ff_gbl_lock:	   0   enable
+		ff_pmtimer:	  0  invalid
+		ff_pwr_btn:	  0   enable
+		ff_rt_clk:	 2  disable
+		ff_slp_btn:	  0  invalid
+		gpe00:	     0	invalid
+		gpe01:	     0	 enable
+		gpe02:	   108	 enable
+		gpe03:	     0	invalid
+		gpe04:	     0	invalid
+		gpe05:	     0	invalid
+		gpe06:	     0	 enable
+		gpe07:	     0	 enable
+		gpe08:	     0	invalid
+		gpe09:	     0	invalid
+		gpe0A:	     0	invalid
+		gpe0B:	     0	invalid
+		gpe0C:	     0	invalid
+		gpe0D:	     0	invalid
+		gpe0E:	     0	invalid
+		gpe0F:	     0	invalid
+		gpe10:	     0	invalid
+		gpe11:	     0	invalid
+		gpe12:	     0	invalid
+		gpe13:	     0	invalid
+		gpe14:	     0	invalid
+		gpe15:	     0	invalid
+		gpe16:	     0	invalid
+		gpe17:	  1084	 enable
+		gpe18:	     0	 enable
+		gpe19:	     0	invalid
+		gpe1A:	     0	invalid
+		gpe1B:	     0	invalid
+		gpe1C:	     0	invalid
+		gpe1D:	     0	invalid
+		gpe1E:	     0	invalid
+		gpe1F:	     0	invalid
+		gpe_all:    1192
+		sci:	1194
 
 		sci - The total number of times the ACPI SCI
 		has claimed an interrupt.
@@ -89,6 +89,13 @@ Description:
 
 		error - an interrupt that can't be accounted for above.
 
+		invalid: it's either a wakeup GPE or a GPE/Fixed Event that
+			doesn't have an event handler.
+
+		disable: the GPE/Fixed Event is valid but disabled.
+
+		enable: the GPE/Fixed Event is valid and enabled.
+
 		Root has permission to clear any of these counters.  Eg.
 		# echo 0 > gpe11
 
@@ -97,3 +104,43 @@ Description:
 
 		None of these counters has an effect on the function
 		of the system, they are simply statistics.
+
+		Besides this, user can also write specific strings to these files
+		to enable/disable/clear ACPI interrupts in user space, which can be
+		used to debug some ACPI interrupt storm issues.
+
+		Note that only writting to VALID GPE/Fixed Event is allowed,
+		i.e. user can only change the status of runtime GPE and
+		Fixed Event with event handler installed.
+
+		Let's take power button fixed event for example, please kill acpid
+		and other user space applications so that the machine won't shutdown
+		when pressing the power button.
+		# cat ff_pwr_btn
+		0
+		# press the power button for 3 times;
+		# cat ff_pwr_btn
+		3
+		# echo disable > ff_pwr_btn
+		# cat ff_pwr_btn
+		disable
+		# press the power button for 3 times;
+		# cat ff_pwr_btn
+		disable
+		# echo enable > ff_pwr_btn
+		# cat ff_pwr_btn
+		4
+		/*
+		 * this is because the status bit is set even if the enable bit is cleared,
+		 * and it triggers an ACPI fixed event when the enable bit is set again
+		 */
+		# press the power button for 3 times;
+		# cat ff_pwr_btn
+		7
+		# echo disable > ff_pwr_btn
+		# press the power button for 3 times;
+		# echo clear > ff_pwr_btn	/* clear the status bit */
+		# echo disable > ff_pwr_btn
+		# cat ff_pwr_btn
+		7
+

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 312fe77..5e497d1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -818,7 +818,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/ide/ide.txt.
 
 	idle=		[X86]
-			Format: idle=poll or idle=mwait
+			Format: idle=poll or idle=mwait, idle=halt, idle=nomwait
 			Poll forces a polling idle loop that can slightly improves the performance
 			of waking up a idle CPU, but will use a lot of power and make the system
 			run hot. Not recommended.
@@ -826,6 +826,9 @@ and is between 256 and 4096 characters. It is defined in the file
 			to not use it because it doesn't save as much power as a normal idle
 			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
 			as idle=poll.
+			idle=halt. Halt is forced to be used for CPU idle.
+			In such case C2/C3 won't be used again.
+			idle=nomwait. Disable mwait for CPU C-states
 
 	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
 			Claim all unknown PCI IDE storage controllers.

Documentation/laptops/acer-wmi.txt

View file

diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index 79b7dbd..69b5dd4 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -174,8 +174,6 @@ The LED is exposed through the LED subsystem, and can be found in:
 The mail LED is autodetected, so if you don't have one, the LED device won't
 be registered.
 
-If you have a mail LED that is not green, please report this to me.
-
 Backlight
 *********
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index ee1c56a..633bda6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,8 +216,8 @@ W:	http://code.google.com/p/aceracpi
 S:	Maintained
 
 ACPI
-P:	Len Brown
-M:	[email protected]
+P:	Andi Kleen
+M:	[email protected]
 M:	[email protected]
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
@@ -239,8 +239,8 @@ W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 
 ACPI FAN DRIVER
-P:	Len Brown
-M:	[email protected]
+P:	Zhang Rui
+M:	[email protected]
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
@@ -252,14 +252,14 @@ L:	[email protected]
 S:	Supported
 
 ACPI THERMAL DRIVER
-P:	Len Brown
-M:	[email protected]
+P:	Zhang Rui
+M:	[email protected]
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 
 ACPI VIDEO DRIVER
-P:	Rui Zhang
+P:	Zhang Rui
 M:	[email protected]
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
@@ -1160,6 +1160,11 @@ M:	[email protected]
 L:	[email protected]
 S:	Supported
 
+COMPAL LAPTOP SUPPORT
+P:	Cezary Jackiewicz
+M:	[email protected]
+S:	Maintained
+
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:	Michael H. Warfield
 M:	[email protected]
@@ -1787,6 +1792,12 @@ P:	David Howells
 M:	[email protected]
 S:	Maintained
 
+FUJITSU LAPTOP EXTRAS
+P:	Jonathan Woithe
+M:	[email protected]
+L:	[email protected]
+S:	Maintained
+
 FUSE: FILESYSTEM IN USERSPACE
 P:	Miklos Szeredi
 M:	[email protected]

arch/ia64/kernel/process.c

View file

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index fabaf08..3ab8373 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -55,6 +55,10 @@ void (*ia64_mark_idle)(int);
 
 unsigned long boot_option_idle_override = 0;
 EXPORT_SYMBOL(boot_option_idle_override);
+unsigned long idle_halt;
+EXPORT_SYMBOL(idle_halt);
+unsigned long idle_nomwait;
+EXPORT_SYMBOL(idle_nomwait);
 
 void
 ia64_do_show_stack (struct unw_frame_info *info, void *arg)

arch/x86/kernel/acpi/processor.c

View file

diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index de2d2e4..7c074ee 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -56,6 +56,12 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
 	if (cpu_has(c, X86_FEATURE_ACPI))
 		buf[2] |= ACPI_PDC_T_FFH;
 
+	/*
+	 * If mwait/monitor is unsupported, C2/C3_FFH will be disabled
+	 */
+	if (!cpu_has(c, X86_FEATURE_MWAIT))
+		buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);
+
 	obj->type = ACPI_TYPE_BUFFER;
 	obj->buffer.length = 12;
 	obj->buffer.pointer = (u8 *) buf;

arch/x86/kernel/process.c

View file

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 7dceea9..4d629c6 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -7,6 +7,12 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/clockchips.h>
+#include <asm/system.h>
+
+unsigned long idle_halt;
+EXPORT_SYMBOL(idle_halt);
+unsigned long idle_nomwait;
+EXPORT_SYMBOL(idle_nomwait);
 
 struct kmem_cache *task_xstate_cachep;
 
@@ -325,7 +331,27 @@ static int __init idle_setup(char *str)
 		pm_idle = poll_idle;
 	} else if (!strcmp(str, "mwait"))
 		force_mwait = 1;
-	else
+	else if (!strcmp(str, "halt")) {
+		/*
+		 * When the boot option of idle=halt is added, halt is
+		 * forced to be used for CPU idle. In such case CPU C2/C3
+		 * won't be used again.
+		 * To continue to load the CPU idle driver, don't touch
+		 * the boot_option_idle_override.
+		 */
+		pm_idle = default_idle;
+		idle_halt = 1;
+		return 0;
+	} else if (!strcmp(str, "nomwait")) {
+		/*
+		 * If the boot option of "idle=nomwait" is added,
+		 * it means that mwait will be disabled for CPU C2/C3
+		 * states. In such case it won't touch the variable
+		 * of boot_option_idle_override.
+		 */
+		idle_nomwait = 1;
+		return 0;
+	} else
 		return -1;
 
 	boot_option_idle_override = 1;

arch/x86/mm/srat_32.c

View file

diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index f41d67f..1eb2973 100644
--- a/arch/x86/mm/srat_32.c
+++ b/arch/x86/mm/srat_32.c
@@ -156,10 +156,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity)
 
 	num_memory_chunks++;
 
-	printk(KERN_DEBUG "Memory range %08lx to %08lx (type %x)"
+	printk(KERN_DEBUG "Memory range %08lx to %08lx"
 			  " in proximity domain %02x %s\n",
 		start_pfn, end_pfn,
-		memory_affinity->memory_type,
 		pxm,
 		((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
 		 "enabled and removable" : "enabled" ) );

drivers/acpi/Makefile

View file

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 40b0fca..4efbe59 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_X86)		+= blacklist.o
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-y				+= osl.o utils.o \
+obj-y				+= osl.o utils.o reboot.o\
 				   dispatcher/ events/ executer/ hardware/ \
 				   namespace/ parser/ resources/ tables/ \
 				   utilities/

drivers/acpi/bay.c

View file

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 61b6c5b..e6caf5d 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,6 +380,9 @@ static int __init bay_init(void)
 	if (acpi_disabled)
 		return -ENODEV;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	/* look for dockable drive bays */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 		ACPI_UINT32_MAX, find_bay, &bays, NULL);

drivers/acpi/bus.c

View file

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a6dbcf4..afb3438 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -612,7 +612,7 @@ static int __init acpi_bus_init_irq(void)
 	return 0;
 }
 
-acpi_native_uint acpi_gbl_permanent_mmap;
+u8 acpi_gbl_permanent_mmap;
 
 
 void __init acpi_early_init(void)

drivers/acpi/dispatcher/dsinit.c

View file

diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 610b1ee..949f7c7 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -151,7 +151,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
  ******************************************************************************/
 
 acpi_status
-acpi_ds_initialize_objects(acpi_native_uint table_index,
+acpi_ds_initialize_objects(u32 table_index,
 			   struct acpi_namespace_node * start_node)
 {
 	acpi_status status;

drivers/acpi/dispatcher/dsmethod.c

View file

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 2509809..4613b9c 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -377,7 +377,6 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 	}
 
 	info->parameters = &this_walk_state->operands[0];
-	info->parameter_type = ACPI_PARAM_ARGS;
 
 	status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,
 				       obj_desc->method.aml_start,

drivers/acpi/dispatcher/dsopcode.c

View file

diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index a818e0d..6a81c44 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -691,12 +691,6 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
 
 	status = acpi_ex_resolve_operands(op->common.aml_opcode,
 					  ACPI_WALK_OPERANDS, walk_state);
-
-	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-			   acpi_ps_get_opcode_name(op->common.aml_opcode),
-			   walk_state->num_operands,
-			   "after AcpiExResolveOperands");
-
 	if (ACPI_FAILURE(status)) {
 		ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
 			    acpi_ps_get_opcode_name(op->common.aml_opcode),
@@ -785,10 +779,6 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,
 		return_ACPI_STATUS(status);
 	}
 
-	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-			   acpi_ps_get_opcode_name(op->common.aml_opcode),
-			   1, "after AcpiExResolveOperands");
-
 	obj_desc = acpi_ns_get_attached_object(node);
 	if (!obj_desc) {
 		return_ACPI_STATUS(AE_NOT_EXIST);
@@ -848,7 +838,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
 	union acpi_operand_object **operand;
 	struct acpi_namespace_node *node;
 	union acpi_parse_object *next_op;
-	acpi_native_uint table_index;
+	u32 table_index;
 	struct acpi_table_header *table;
 
 	ACPI_FUNCTION_TRACE_PTR(ds_eval_table_region_operands, op);
@@ -882,10 +872,6 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,
 		return_ACPI_STATUS(status);
 	}
 
-	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-			   acpi_ps_get_opcode_name(op->common.aml_opcode),
-			   1, "after AcpiExResolveOperands");
-
 	operand = &walk_state->operands[0];
 
 	/* Find the ACPI table */
@@ -1091,10 +1077,8 @@ acpi_ds_eval_bank_field_operands(struct acpi_walk_state *walk_state,
 		return_ACPI_STATUS(status);
 	}
 
-	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
-			   acpi_ps_get_opcode_name(op->common.aml_opcode),
-			   1, "after AcpiExResolveOperands");
-
+	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
+			   acpi_ps_get_opcode_name(op->common.aml_opcode), 1);
 	/*
 	 * Get the bank_value operand and save it
 	 * (at Top of stack)

drivers/acpi/dispatcher/dswexec.c

View file

diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index b246b96..b5072fa 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -408,14 +408,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 							    [walk_state->
 							     num_operands - 1]),
 							  walk_state);
-			if (ACPI_SUCCESS(status)) {
-				ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS,
-						   ACPI_IMODE_EXECUTE,
-						   acpi_ps_get_opcode_name
-						   (walk_state->opcode),
-						   walk_state->num_operands,
-						   "after ExResolveOperands");
-			}
 		}
 
 		if (ACPI_SUCCESS(status)) {

drivers/acpi/dispatcher/dswstate.c

View file

diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 1386ced..b00d4af 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -70,7 +70,7 @@ acpi_status
 acpi_ds_result_pop(union acpi_operand_object **object,
 		   struct acpi_walk_state *walk_state)
 {
-	acpi_native_uint index;
+	u32 index;
 	union acpi_generic_state *state;
 	acpi_status status;
 
@@ -122,7 +122,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
 			  "Obj=%p [%s] Index=%X State=%p Num=%X\n", *object,
 			  acpi_ut_get_object_type_name(*object),
-			  (u32) index, walk_state, walk_state->result_count));
+			  index, walk_state, walk_state->result_count));
 
 	return (AE_OK);
 }
@@ -146,7 +146,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
 {
 	union acpi_generic_state *state;
 	acpi_status status;
-	acpi_native_uint index;
+	u32 index;
 
 	ACPI_FUNCTION_NAME(ds_result_push);
 
@@ -400,7 +400,7 @@ void
 acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
 				 struct acpi_walk_state *walk_state)
 {
-	acpi_native_int i;
+	s32 i;
 	union acpi_operand_object *obj_desc;
 
 	ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
@@ -409,7 +409,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
 		return;
 	}
 
-	for (i = (acpi_native_int) (pop_count - 1); i >= 0; i--) {
+	for (i = (s32) pop_count - 1; i >= 0; i--) {
 		if (walk_state->num_operands == 0) {
 			return;
 		}
@@ -615,14 +615,8 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
 	walk_state->pass_number = pass_number;
 
 	if (info) {
-		if (info->parameter_type == ACPI_PARAM_GPE) {
-			walk_state->gpe_event_info =
-			    ACPI_CAST_PTR(struct acpi_gpe_event_info,
-					  info->parameters);
-		} else {
-			walk_state->params = info->parameters;
-			walk_state->caller_return_desc = &info->return_object;
-		}
+		walk_state->params = info->parameters;
+		walk_state->caller_return_desc = &info->return_object;
 	}
 
 	status = acpi_ps_init_scope(&walk_state->parser_state, op);

drivers/acpi/dock.c

View file

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bb7c51f..1e872e7 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,6 +920,9 @@ static int __init dock_init(void)
 	if (acpi_disabled)
 		return 0;
 
+	if (acpi_disabled)
+		return 0;
+
 	/* look for a dock station */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 			    ACPI_UINT32_MAX, find_dock, &num, NULL);

drivers/acpi/events/evevent.c

View file

diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 5d30e5b..c56c5c6 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -188,7 +188,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 
 static acpi_status acpi_ev_fixed_event_initialize(void)
 {
-	acpi_native_uint i;
+	u32 i;
 	acpi_status status;
 
 	/*
@@ -231,7 +231,7 @@ u32 acpi_ev_fixed_event_detect(void)
 	u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
 	u32 fixed_status;
 	u32 fixed_enable;
-	acpi_native_uint i;
+	u32 i;
 
 	ACPI_FUNCTION_NAME(ev_fixed_event_detect);
 
@@ -260,7 +260,7 @@ u32 acpi_ev_fixed_event_detect(void)
 
 			/* Found an active (signalled) event */
 			acpi_os_fixed_event_count(i);
-			int_status |= acpi_ev_fixed_event_dispatch((u32) i);