]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
15 years agox86: drop double underscores from header guards
H. Peter Anvin [Thu, 23 Oct 2008 07:01:39 +0000 (00:01 -0700)]
x86: drop double underscores from header guards

Drop double underscores from header guards in arch/x86/include.  They
are used inconsistently, and are not necessary.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86: Fix ASM_X86__ header guards
H. Peter Anvin [Thu, 23 Oct 2008 05:26:29 +0000 (22:26 -0700)]
x86: Fix ASM_X86__ header guards

Change header guards named "ASM_X86__*" to "_ASM_X86_*" since:

a. the double underscore is ugly and pointless.
b. no leading underscore violates namespace constraints.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of uml-config.h
Al Viro [Sat, 11 Oct 2008 22:39:18 +0000 (18:39 -0400)]
x86, um: get rid of uml-config.h

Take a few symbols we need into kern_constants.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of arch/um/Kconfig.arch
Al Viro [Mon, 25 Aug 2008 08:51:27 +0000 (04:51 -0400)]
x86, um: get rid of arch/um/Kconfig.arch

Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile
is allowed to say Kconfig := <whatever I want instead of arch/blah/Kconfig>.
Rewrite arch/um/Kconfig and arch/um/Kconfig.<subarch> so that the latter
would be top-level one (and include the pieces of the former).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of arch/um/os symlink
Al Viro [Mon, 25 Aug 2008 08:14:29 +0000 (04:14 -0400)]
x86, um: get rid of arch/um/os symlink

we can get DEV_NULL defined for arch/um/drivers/null.c in less
convoluted ways, TYVM...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of excessive includes of uml-config.h
Al Viro [Mon, 25 Aug 2008 08:12:10 +0000 (04:12 -0400)]
x86, um: get rid of excessive includes of uml-config.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of header symlinks
Al Viro [Sat, 23 Aug 2008 21:28:20 +0000 (17:28 -0400)]
x86, um: get rid of header symlinks

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: merge Kconfig.i386 and Kconfig.x86_64
Al Viro [Sat, 23 Aug 2008 21:00:34 +0000 (17:00 -0400)]
x86, um: merge Kconfig.i386 and Kconfig.x86_64

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of sysdep symlink
Al Viro [Tue, 19 Aug 2008 01:44:32 +0000 (21:44 -0400)]
x86, um: get rid of sysdep symlink

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: trim the junk from uml ptrace-*.h
Al Viro [Mon, 18 Aug 2008 21:47:45 +0000 (17:47 -0400)]
x86, um: trim the junk from uml ptrace-*.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: take vm-flags.h to sysdep
Al Viro [Mon, 18 Aug 2008 14:20:37 +0000 (10:20 -0400)]
x86, um: take vm-flags.h to sysdep

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of uml asm/arch
Al Viro [Mon, 18 Aug 2008 08:54:36 +0000 (04:54 -0400)]
x86, um: get rid of uml asm/arch

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of uml highmem.h
Al Viro [Mon, 18 Aug 2008 08:15:12 +0000 (04:15 -0400)]
x86, um: get rid of uml highmem.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of uml unistd.h
Al Viro [Mon, 18 Aug 2008 08:01:47 +0000 (04:01 -0400)]
x86, um: get rid of uml unistd.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of system.h -> system.h include
Al Viro [Mon, 18 Aug 2008 07:25:24 +0000 (03:25 -0400)]
x86, um: get rid of system.h -> system.h include

Long-term we want to split system.h and include barriers part from
underlying target; for now copy that part to sysdep.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: uml atomic.h is not needed anymore
Al Viro [Mon, 18 Aug 2008 05:36:36 +0000 (01:36 -0400)]
x86, um: uml atomic.h is not needed anymore

Its only difference from underlying atomic.h used to be the include
of kernel.h; it's not needed there anymore.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: untangle uml ldt.h
Al Viro [Mon, 18 Aug 2008 05:26:38 +0000 (01:26 -0400)]
x86, um: untangle uml ldt.h

* turn asm/ldt.h into ldt.h; update the (very few) users
* take host_ldt.h into sysdep, kill symlink mess
* includes of asm/arch/ldt.h turn into asm/ldt.h now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of more uml asm/arch uses
Al Viro [Mon, 18 Aug 2008 04:19:01 +0000 (00:19 -0400)]
x86, um: get rid of more uml asm/arch uses

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: remove dead header (uml module-generic.h; never used these days)
Al Viro [Mon, 18 Aug 2008 04:14:39 +0000 (00:14 -0400)]
x86, um: remove dead header (uml module-generic.h; never used these days)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: get rid of uml signal.h
Al Viro [Mon, 18 Aug 2008 04:12:41 +0000 (00:12 -0400)]
x86, um: get rid of uml signal.h

the only theoretical reason for it these days is ppc; aside of uml/ppc
being dead, do_signal() would be happier in arch/powerpc/kernel/signal.h
anyway.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: sanitize uml sigcontext.h uses
Al Viro [Mon, 18 Aug 2008 03:58:32 +0000 (23:58 -0400)]
x86, um: sanitize uml sigcontext.h uses

a) the only difference between sigcontext and sysdep/sigcontext
is that the former contains externs for two long-dead functions.
Removed, switched the only user to sysdep/sigcontext

b) asm/sigcontext.h is removable - that of underlying architecture
would get used.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: now we can get rid of trivial uml headers
Al Viro [Mon, 18 Aug 2008 02:54:55 +0000 (22:54 -0400)]
x86, um: now we can get rid of trivial uml headers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: ... and asm-x86 move
Al Viro [Mon, 18 Aug 2008 01:05:42 +0000 (21:05 -0400)]
x86, um: ... and asm-x86 move

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: initial part of asm-um move
Al Viro [Sun, 17 Aug 2008 23:13:17 +0000 (19:13 -0400)]
x86, um: initial part of asm-um move

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agox86, um: take arch/um/include/* out of the way
Al Viro [Sun, 17 Aug 2008 17:48:37 +0000 (13:48 -0400)]
x86, um: take arch/um/include/* out of the way

We can't just plop asm/* into it - userland helpers are built with it
in search path and seeing asm/* show up there suddenly would be a bad
idea.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
15 years agoACPI: fix ia64 build warning
Len Brown [Thu, 23 Oct 2008 05:47:29 +0000 (01:47 -0400)]
ACPI: fix ia64 build warning

arch/ia64/sn/kernel/io_acpi_init.c:361: warning: format ‘%lx’ expects type ‘long unsigned int’, but argument 3 has type ‘long long unsigned int’

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoMerge branch 'bugzilla-11715' into test
Len Brown [Thu, 23 Oct 2008 05:28:19 +0000 (01:28 -0400)]
Merge branch 'bugzilla-11715' into test

15 years agoACPI: hack around sysfs warning with link order
Zhao Yakui [Fri, 17 Oct 2008 08:33:57 +0000 (16:33 +0800)]
ACPI: hack around sysfs warning with link order

    There exists the following warning message will appear after the
following commit is merged.
   >commit f2e969acd6d5981e6b1272810002558650d0736e
   >Author: Zhao Yakui <yakui.zhao@intel.com>
   >Date:   Mon Aug 11 14:57:50 2008 +0800
    >ACPI: Add "acpi.power_nocheck=1" to disable power state check in
power transition:

   >WARNING: at linux-2.6/fs/sysfs/dir.c:463  sysfs_add_one+0x33/0x39()
   >sysfs: duplicate filename 'acpi' can not be created
   >kobject_add_internal failed for acpi with -EEXIST, don't try to register
            things with the same name in the same directory

   In the above commit the "acpi.power_nocheck" module parameter is defined
in drivers/acpi/power.c file. As several module parameters using the same ACPI
prefix are defined in the different files(for example: power_nocheck is
defined in drivers/acpi/power.c,debug_layer/debug_level are defined in
drivers/acpi/debug.c) and there exists another module between them, the
warning message will be printed when using the current generic param code.
(In the function of param_sysfs_init).

   In fact when ACPI is selected, the drivers/acpi/power will also be compiled
as built-in kernel.So this issue can be fixed by the following approach.
   workaround it by adjusting the module link order in drivers/acpi/Makefile.
In such case the module parameter using the same prefix(ACPI) are put together
in the param data section.

   Of course the better solution is to fix it in generic param code related
with sysfs.

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
Len Brown [Thu, 23 Oct 2008 04:45:18 +0000 (00:45 -0400)]
ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n

drivers/acpi/sleep/main.c:27: warning: ‘acpi_target_sleep_state’ defined but not used

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agointel_menlo: fix build warning
Len Brown [Thu, 23 Oct 2008 04:43:47 +0000 (00:43 -0400)]
intel_menlo: fix build warning

drivers/misc/intel_menlow.c:107: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘long long unsigned int’

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoMerge branch 'linus' into test
Len Brown [Thu, 23 Oct 2008 03:57:26 +0000 (23:57 -0400)]
Merge branch 'linus' into test

Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agodrm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
Eric Anholt [Tue, 21 Oct 2008 18:53:01 +0000 (11:53 -0700)]
drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <michel@tungstengraphics.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
Eric Anholt [Tue, 21 Oct 2008 18:38:50 +0000 (11:38 -0700)]
drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.

This fixes vblank support for a 32-bit X Server on a 64-bit kernel.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm/i915: use pipes, not planes to label vblank data
Keith Packard [Sun, 19 Oct 2008 02:39:29 +0000 (19:39 -0700)]
drm/i915: use pipes, not planes to label vblank data

vblank in the kernel is far simpler if it deals with pipes instead of
planes, so we're changing both user and kernel side.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
Keith Packard [Fri, 17 Oct 2008 04:18:27 +0000 (21:18 -0700)]
drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations

To synchronize clip lists with the X server, the DRM lock must be held while
looking at drawable clip lists. To synchronize with other ring access, the
ring mutex must be held while inserting commands into the ring.  Failure to
do the first resulted in easy visual corruption when moving windows, and the
second could have corrupted the ring with DRI2.

Grabbing the DRM lock involves using the DRM tasklet mechanism, grabbing the
ring mutex means potentially sleeping. Deal with both of these by always
running the tasklet from a work handler.

Also, protect from clip list changes since the vblank request was queued by
making sure the window has at least one rectangle while looking inside,
preventing oopses .

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agoi915: Fix format string warnings on x86-64.
Linus Torvalds [Fri, 17 Oct 2008 22:43:02 +0000 (15:43 -0700)]
i915: Fix format string warnings on x86-64.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agoi915: Don't dereference HWS in /proc debug files when it isn't initialized.
Eric Anholt [Fri, 17 Oct 2008 21:41:03 +0000 (14:41 -0700)]
i915: Don't dereference HWS in /proc debug files when it isn't initialized.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agoi915: Enable IMR passthrough of vblank events before enabling it in pipestat.
Eric Anholt [Fri, 17 Oct 2008 22:41:26 +0000 (15:41 -0700)]
i915: Enable IMR passthrough of vblank events before enabling it in pipestat.

Otherwise, if we lost the race, the pipestat bit would be set without being
reflected in IIR, and we would never clear the pipestat bit so the pipe
event would never be generated again, and all vblank waits would time out.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm: Remove two leaks of vblank reference count in error paths.
Eric Anholt [Fri, 17 Oct 2008 18:03:53 +0000 (11:03 -0700)]
drm: Remove two leaks of vblank reference count in error paths.

If the failing paths were hit, the vblank IRQ would never get turned off
again.

Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm: fix leak of cliprects in drm_rmdraw()
Zhenyu Wang [Fri, 17 Oct 2008 07:48:44 +0000 (15:48 +0800)]
drm: fix leak of cliprects in drm_rmdraw()

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agoi915: Disable MSI on GM965 (errata says it doesn't work)
Keith Packard [Fri, 17 Oct 2008 07:44:42 +0000 (00:44 -0700)]
i915: Disable MSI on GM965 (errata says it doesn't work)

Current Intel errata for the GM965 says that using MSI may cause interrupts
to be delayed or lost. The only workaround offered is to not use it.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agodrm: Set cliprects to NULL when changing drawable to having 0 cliprects.
Zhenyu Wang [Fri, 17 Oct 2008 05:15:48 +0000 (13:15 +0800)]
drm: Set cliprects to NULL when changing drawable to having 0 cliprects.

This avoids setting the cliprects pointer to a zero-sized allocation.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agoi915: Protect vblank IRQ reg access with spinlock
Keith Packard [Thu, 16 Oct 2008 18:31:38 +0000 (11:31 -0700)]
i915: Protect vblank IRQ reg access with spinlock

This uses the same spinlock as the user_irq code as it shares the same
register, ensuring that interrupt registers are updated atomically.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
15 years agopanasonic-laptop: fix build
Len Brown [Sat, 11 Oct 2008 06:30:14 +0000 (02:30 -0400)]
panasonic-laptop: fix build

sync with acpi_driver_data(device)
and acpi_evaluate_integer(..., long long)
changes that happened since this driver
was checked in.

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agosh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().
Paul Mundt [Thu, 23 Oct 2008 03:37:20 +0000 (12:37 +0900)]
sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
15 years agoMerge branch 'panasonic' into test
Len Brown [Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)]
Merge branch 'panasonic' into test

15 years agoMerge branch 'yinghai' into test
Len Brown [Thu, 23 Oct 2008 03:35:56 +0000 (23:35 -0400)]
Merge branch 'yinghai' into test

15 years agosh: mach-highlander: Handle SCIF pinmuxing on R7785RP.
Paul Mundt [Thu, 23 Oct 2008 03:35:43 +0000 (12:35 +0900)]
sh: mach-highlander: Handle SCIF pinmuxing on R7785RP.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
15 years agoMerge branch 'ull' into test
Len Brown [Thu, 23 Oct 2008 03:33:29 +0000 (23:33 -0400)]
Merge branch 'ull' into test

Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoMerge branch 'thinkpad' into test
Len Brown [Thu, 23 Oct 2008 03:28:48 +0000 (23:28 -0400)]
Merge branch 'thinkpad' into test

15 years agoMerge branch 'suspend' into test
Len Brown [Thu, 23 Oct 2008 03:28:46 +0000 (23:28 -0400)]
Merge branch 'suspend' into test

15 years agoMerge branch 'pnp-debug' into test
Len Brown [Thu, 23 Oct 2008 03:28:43 +0000 (23:28 -0400)]
Merge branch 'pnp-debug' into test

15 years agoMerge branch 'misc' into test
Len Brown [Thu, 23 Oct 2008 03:28:38 +0000 (23:28 -0400)]
Merge branch 'misc' into test

15 years agoMerge branch 'i7300_idle' into test
Len Brown [Thu, 23 Oct 2008 03:28:36 +0000 (23:28 -0400)]
Merge branch 'i7300_idle' into test

15 years agoMerge branch 'fujitsu' into test
Len Brown [Thu, 23 Oct 2008 03:28:33 +0000 (23:28 -0400)]
Merge branch 'fujitsu' into test

15 years agoMerge branch 'fadt-test' into test
Len Brown [Thu, 23 Oct 2008 03:28:03 +0000 (23:28 -0400)]
Merge branch 'fadt-test' into test

15 years agoMerge branch 'eeepc' into test
Len Brown [Thu, 23 Oct 2008 03:28:01 +0000 (23:28 -0400)]
Merge branch 'eeepc' into test

15 years agoMerge branch 'ec' into test
Len Brown [Thu, 23 Oct 2008 03:27:59 +0000 (23:27 -0400)]
Merge branch 'ec' into test

15 years agoMerge branch 'dock' into test
Len Brown [Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)]
Merge branch 'dock' into test

Conflicts:
drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoMerge branch 'cpuidle' into test
Len Brown [Thu, 23 Oct 2008 03:20:05 +0000 (23:20 -0400)]
Merge branch 'cpuidle' into test

15 years agoMerge branch 'bugzilla-11481' into test
Len Brown [Thu, 23 Oct 2008 03:20:02 +0000 (23:20 -0400)]
Merge branch 'bugzilla-11481' into test

15 years agoMerge branch 'bugzilla-10503' into test
Len Brown [Thu, 23 Oct 2008 03:20:01 +0000 (23:20 -0400)]
Merge branch 'bugzilla-10503' into test

15 years agoMerge branch 'bugzilla-10237' into test
Len Brown [Thu, 23 Oct 2008 03:19:59 +0000 (23:19 -0400)]
Merge branch 'bugzilla-10237' into test

15 years agoMerge branch 'asus-cleanup' into test
Len Brown [Thu, 23 Oct 2008 03:19:57 +0000 (23:19 -0400)]
Merge branch 'asus-cleanup' into test

15 years agoMerge branch 'acpica' into test
Len Brown [Thu, 23 Oct 2008 03:19:51 +0000 (23:19 -0400)]
Merge branch 'acpica' into test

15 years agoMerge branch 'bugfixes' into test
Len Brown [Thu, 23 Oct 2008 03:19:50 +0000 (23:19 -0400)]
Merge branch 'bugfixes' into test

15 years agoMerge branch 'acer-wmi' into test
Len Brown [Thu, 23 Oct 2008 03:19:47 +0000 (23:19 -0400)]
Merge branch 'acer-wmi' into test

15 years agoMerge branch 'FW_BUG' into test
Len Brown [Thu, 23 Oct 2008 03:19:45 +0000 (23:19 -0400)]
Merge branch 'FW_BUG' into test

15 years agoACPICA: Update version to 20080926
Bob Moore [Sat, 27 Sep 2008 05:39:20 +0000 (13:39 +0800)]
ACPICA: Update version to 20080926

Update version to 20080926.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Add support for zero-length buffer-to-string conversions
Bob Moore [Sat, 27 Sep 2008 05:27:51 +0000 (13:27 +0800)]
ACPICA: Add support for zero-length buffer-to-string conversions

Allow zero length strings during interpreter buffer-to-string
conversions. For example, during the ToDecimalString and
ToHexString operaters, as well as implicit conversions. Fiodor
Suietov.  ACPICA BZ 585.

http://www.acpica.org/bugzilla/show_bug.cgi?id=585

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: New: Validation for predefined ACPI methods/objects
Bob Moore [Sun, 28 Sep 2008 07:26:17 +0000 (15:26 +0800)]
ACPICA: New: Validation for predefined ACPI methods/objects

Validates predefined ACPI objects that appear in the namespace,
at the time they are evaluated. The argument count and the type of
the returned object are validated. The purpose of this validation
is to detect problems with the BIOS-exposed predefined ACPI objects
before the results are returned to the ACPI-related drivers.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix for implicit return compatibility
Lin Ming [Sat, 27 Sep 2008 04:01:12 +0000 (12:01 +0800)]
ACPICA: Fix for implicit return compatibility

Predicate can be used for an implicit return value.
This change improves the implicit return mechanism to be more
compatible with the MS interpreter.

http://www.acpica.org/bugzilla/show_bug.cgi?id=349

Below AML code from http://bugzilla.kernel.org/show_bug.cgi?id=10686

Store(0x07D6, OSYS)
Method (_CRT, 0, Serialized)
{
    If (LLess (OSYS, 0x07D6))
    {
If (LEqual (\_SB.TJ85, Zero))
{
    Return (Add (0x0AAC, Multiply (TPC, 0x0A)))
}
Else
{
    Return (Add (0x0AAC, Multiply (TP85, 0x0A)))
}
    }
}

Previously _CRT returns 0x07D6, now it returns 0 (predicate value of LLess)

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fixed a couple memory leaks associated with "implicit return"
Lin Ming [Sat, 27 Sep 2008 03:50:24 +0000 (11:50 +0800)]
ACPICA: Fixed a couple memory leaks associated with "implicit return"

Fixed a couple memory leaks associated with "implicit return" objects
when the AML Interpreter slack mode is enabled.

http://www.acpica.org/bugzilla/show_bug.cgi?id=349

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Optimize buffer allocation procedure
Bob Moore [Sat, 27 Sep 2008 03:34:48 +0000 (11:34 +0800)]
ACPICA: Optimize buffer allocation procedure

Eliminate duplicate code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix possible memory leak, error exit path
Lin Ming [Sat, 27 Sep 2008 03:29:57 +0000 (11:29 +0800)]
ACPICA: Fix possible memory leak, error exit path

Fixed two possible memory leaks in the error exit paths of
acpi_ut_update_objerct_reference() and
acpi_ut_walk_package_tree()
These functions are similar in that they use a stack of state objects in
order to eliminate recursion. The stack must be fully deallocated
if an error occurs.

http://www.acpica.org/bugzilla/show_bug.cgi?id=383

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix fault after mem allocation failure in AML parser
Lin Ming [Sat, 27 Sep 2008 03:28:46 +0000 (11:28 +0800)]
ACPICA: Fix fault after mem allocation failure in AML parser

Fixes a crash if a memory allocation fails during the Op completion
routine acpi_ps_complete_this_op().

http://www.acpica.org/bugzilla/show_bug.cgi?id=492

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Remove unused ACPI register bit definition
Lin Ming [Sat, 27 Sep 2008 03:26:59 +0000 (11:26 +0800)]
ACPICA: Remove unused ACPI register bit definition

Removed the ACPI_BITREG_WAKE_ENABLE definition and entry in the
global register table. This bit does not exist and is unused.

http://www.acpica.org/bugzilla/show_bug.cgi?id=442

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Update version to 20080829
Bob Moore [Sat, 27 Sep 2008 03:14:04 +0000 (11:14 +0800)]
ACPICA: Update version to 20080829

Update version to 20080829.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
Bob Moore [Sat, 27 Sep 2008 03:12:36 +0000 (11:12 +0800)]
ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname

Fixes a memory leak in the error exit path.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Cleanup for internal Reference Object
Bob Moore [Sat, 27 Sep 2008 03:08:41 +0000 (11:08 +0800)]
ACPICA: Cleanup for internal Reference Object

Fix some sloppiness in the Reference object. No longer use AML
opcodes to differentiate the types, introduce new reference
Class. Cleanup the debug output code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Update comments - no functional changes
Bob Moore [Sat, 27 Sep 2008 02:42:02 +0000 (10:42 +0800)]
ACPICA: Update comments - no functional changes

Some formatting and spelling fixes.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Update for Reference ACPI_OPERAND_OBJECT
Bob Moore [Sat, 27 Sep 2008 02:40:39 +0000 (10:40 +0800)]
ACPICA: Update for Reference ACPI_OPERAND_OBJECT

1) Add new field for use by DdbHandle (Value)
2) Use ACPI_CAST_INDIRECT_PTR to eliminate strict type warnings
3) Cleanup debug output

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Reduce error to warning for incorrect method arg count
Lin Ming [Sat, 27 Sep 2008 02:38:07 +0000 (10:38 +0800)]
ACPICA: Reduce error to warning for incorrect method arg count

Previously aborted with error if too few arguments were passed to
a control method via the external ACPICA interface. Now issue a
warning instead and continue. Handles the case where the method
inadvertently declares too many arguments, but does not actually
use the extra ones.  Applies mainly to the predefined methods.

http://bugzilla.kernel.org/show_bug.cgi?id=11032

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Disallow evaluation of named object types with no value
Bob Moore [Sat, 27 Sep 2008 02:29:31 +0000 (10:29 +0800)]
ACPICA: Disallow evaluation of named object types with no value

Return AE_TYPE for objects that have no value and therefore
evaluation is undefined: Device, Event, Mutex, Region, Thermal,
and Scope.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Remove obsolete exception codes
Bob Moore [Sat, 27 Sep 2008 02:28:07 +0000 (10:28 +0800)]
ACPICA: Remove obsolete exception codes

Removed 10 exception codes (and corresponding name strings)
that were obsolete for various reasons.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Add namespace node to operand object union
Bob Moore [Sat, 27 Sep 2008 02:22:09 +0000 (10:22 +0800)]
ACPICA: Add namespace node to operand object union

Add ACPI_NAMESPACE_NODE to the ACPI_OPERAND_OBJECT in order to
simplify code that accepts both of these objects. A common type
field is used to differentiate them.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Remove obsolete debug levels (WARN and ERROR)
Bob Moore [Sun, 28 Sep 2008 07:00:47 +0000 (15:00 +0800)]
ACPICA: Remove obsolete debug levels (WARN and ERROR)

Removed ACPI_DB_WARN and ACPI_DB_ERROR. These debug levels were
made obsolete by the ACPI_WARNING and ACPI_ERROR/ACPI_EXCEPTION
interfaces.  Also added ACPI_DB_EVENTS to correspond with the
existing ACPI_LV_EVENTS.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPI: replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk
Lin Ming [Sun, 28 Sep 2008 06:51:56 +0000 (14:51 +0800)]
ACPI: replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk

ACPI_DB_ERROR and ACPI_DB_WARN were removed from ACPICA core.
So replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk(KERN_ERR PREFIX ...)
and ACPI_DEBUG_PRINT((ACPI_DB_WARN, ...) with printk(KERN_WARNING PREFIX ...)

We do not use ACPI_ERROR/ACPI_WARNING since they're not exported, see
-------------------------------------------------------------
commit 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4
Author: Len Brown <len.brown@intel.com>
Date:   Mon Jun 26 23:41:38 2006 -0400

    ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)

Signed-off-by: Len Brown <len.brown@intel.com>
-------------------------------------------------------------

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: add preemption point after each opcode parse
Alexey Starikovskiy [Thu, 25 Sep 2008 17:40:30 +0000 (21:40 +0400)]
ACPICA: add preemption point after each opcode parse

Reference: http://marc.info/?l=linux-acpi&m=122236382701062&w=2

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Update version to 20080729
Bob Moore [Mon, 4 Aug 2008 03:15:11 +0000 (11:15 +0800)]
ACPICA: Update version to 20080729

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: x2APIC support: changes for MADT and SRAT ACPI tables
Bob Moore [Mon, 4 Aug 2008 02:42:47 +0000 (10:42 +0800)]
ACPICA: x2APIC support: changes for MADT and SRAT ACPI tables

Support for the x2APIC. There are 2 new subtables for the MADT and
one new subtable for the SRAT. Includes disassembler and acpisrc
support. Data from the Intel 64 Architecture x2APIC Specification,
June 2008.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Improve object conversion error messages
Bob Moore [Mon, 4 Aug 2008 02:41:29 +0000 (10:41 +0800)]
ACPICA: Improve object conversion error messages

Better error messages during object conversion from internal
to the external ACPI_OBJECT. Used for external calls to
acpi_evaluate_object.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Add function to decode reference obj types to strings
Bob Moore [Mon, 4 Aug 2008 02:40:09 +0000 (10:40 +0800)]
ACPICA: Add function to decode reference obj types to strings

Created for improved error messages.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Update version to 20080701
Bob Moore [Mon, 4 Aug 2008 02:12:31 +0000 (10:12 +0800)]
ACPICA: Update version to 20080701

Update version to 20080701.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Return method arg count from acpi_get_object_info
Bob Moore [Fri, 4 Jul 2008 02:53:58 +0000 (10:53 +0800)]
ACPICA: Return method arg count from acpi_get_object_info

Also update the debugger so that the correct number of arguments is
passed to the method. Prevents a warning message from the debugger.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Cleanup macro definition file.
Bob Moore [Mon, 4 Aug 2008 01:54:17 +0000 (09:54 +0800)]
ACPICA: Cleanup macro definition file.

Removed unused macros. Ensure that multiple parameters always have a space
after a comma. Cleanup some comments.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix warning for 64-bit build
Bob Moore [Fri, 15 Aug 2008 02:32:59 +0000 (04:32 +0200)]
ACPICA: Fix warning for 64-bit build

Fixes warning from exconfig.c on 64-bit build.

AK: This actually was fixed earlier in Linux, this just syncs with
AK: the version of the fix that went into the ACPCA codebase

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Add function to dereference returned reference objects
Lin Ming [Mon, 4 Aug 2008 05:22:10 +0000 (13:22 +0800)]
ACPICA: Add function to dereference returned reference objects

Examines the return object from a call to acpi_evaluate_object.
Any Index or RefOf references are automatically dereferenced in
an attempt to return something useful (these reference types
cannot be converted into an external ACPI_OBJECT.)
Lin Ming, Bob Moore.

http://bugzilla.kernel.org/show_bug.cgi?id=11105

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Return status from global init function
Yi Yang [Mon, 4 Aug 2008 02:30:09 +0000 (10:30 +0800)]
ACPICA: Return status from global init function

Return status from acpi_ut_init_globals. This is used by both
the kernel subsystem and the utilities such as iASL compiler.
The function could possibly fail when the caches are initialized.
Yang Yi.

Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
15 years agoACPICA: Fix table compare code, length then data
Bob Moore [Fri, 4 Jul 2008 02:57:51 +0000 (10:57 +0800)]
ACPICA: Fix table compare code, length then data

Split the ACPI table compare. First check that the lengths match
exactly. Then compare the data.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>