[patch 16/16] acpi: suppress power button event on S3 resume

[patch 16/16] acpi: suppress power button event on S3 resume

[akpm]

From: "Arnaud Patard" <apatard@mandriva.com>

Suppress POWER_BUTTON event on S3 resume.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Acked-by: "Yu, Luming" <luming.yu@intel.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/acpi/sleep/main.c |    8 ++++++++
 1 files changed, 8 insertions(+)

diff -puN drivers/acpi/sleep/main.c~acpi-suppress-power-button-event-on-s3-resume drivers/acpi/sleep/main.c
--- 25/drivers/acpi/sleep/main.c~acpi-suppress-power-button-event-on-s3-resume	Wed Apr 26 14:15:19 2006
+++ 25-akpm/drivers/acpi/sleep/main.c	Wed Apr 26 14:15:19 2006
@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t
 	default:
 		return -EINVAL;
 	}
+
+	/* ACPI 3.0 specs (P62) says that it's the responsabilty
+	 * of the OSPM to clear the status bit [ implying that the
+	 * POWER_BUTTON event should not reach userspace ]
+	 */
+	if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
+		acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
+
 	local_irq_restore(flags);
 	printk(KERN_DEBUG "Back to C!\n");
 
_

Re: [patch 16/16] acpi: suppress power button event on S3 resume

[Sergio Monteiro Basto]

[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]

ok here it goes the state of applying this 16 patches against 2.6.17-rc4

Patches 
1 2 out of date (n out of m hunks FAILED)
3 4 ok
5 out of date
6 ok
7 8 9 10 out of date 
11 12 13 ok
14 out of date 
15 16 ok



On Thu, 2006-04-27 at 02:25 -0700, akpm@osdl.org wrote:
> From: "Arnaud Patard" <apatard@mandriva.com>
> 
> Suppress POWER_BUTTON event on S3 resume.
> 
> Signed-off-by: Arnaud Patard <apatard@mandriva.com>
> Acked-by: "Yu, Luming" <luming.yu@intel.com>
> Cc: "Brown, Len" <len.brown@intel.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
> 
>  drivers/acpi/sleep/main.c |    8 ++++++++
>  1 files changed, 8 insertions(+)
> 
> diff -puN drivers/acpi/sleep/main.c~acpi-suppress-power-button-event-on-s3-resume drivers/acpi/sleep/main.c
> --- 25/drivers/acpi/sleep/main.c~acpi-suppress-power-button-event-on-s3-resume	Wed Apr 26 14:15:19 2006
> +++ 25-akpm/drivers/acpi/sleep/main.c	Wed Apr 26 14:15:19 2006
> @@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t
>  	default:
>  		return -EINVAL;
>  	}
> +
> +	/* ACPI 3.0 specs (P62) says that it's the responsabilty
> +	 * of the OSPM to clear the status bit [ implying that the
> +	 * POWER_BUTTON event should not reach userspace ]
> +	 */
> +	if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
> +		acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
> +
>  	local_irq_restore(flags);
>  	printk(KERN_DEBUG "Back to C!\n");
>  
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2166 bytes --]

Re: [patch 16/16] acpi: suppress power button event on S3 resume

[Andrew Morton]

Sergio Monteiro Basto <sergio@sergiomb.no-ip.org> wrote:
>
> ok here it goes the state of applying this 16 patches against 2.6.17-rc4
> 
>  Patches 
>  1 2 out of date (n out of m hunks FAILED)
>  3 4 ok
>  5 out of date
>  6 ok
>  7 8 9 10 out of date 
>  11 12 13 ok
>  14 out of date 
>  15 16 ok

Thanks, but I always prepare the patches against Len's latest tree, not
against mainline.

RE: [patch 16/16] acpi: suppress power button event on S3 resume

[Brown, Len]

>ok here it goes the state of applying this 16 patches against
2.6.17-rc4

heh, want a job?:-)

Although Andrew publishes the patches as they apply cleanly in the -mm
series,
I actually do exactly what you tried -- I generally apply the patches to
branches
based directly on Linus' tree rather than on top of sometimes unrelated
patches
that are also in my tree.  Then I pick what branches are ready to go and
merge them into a "test" branch for Andrew, and into a "release" branch
for Linus.

For patches with no dependencies, this allows them to "pass" each other
depending on urgency, test soak time etc.  For patches that have
conflicts,
this burns a lot of my time merging to pull the patches into "test" for
-mm
and then I repeat the same merge again to pull into "release" (no, Linus
doesn't want the test history in his "clean" history)  As ACPI didn't
go into 2.6.17, we are (what I consider) an uncomfortable distance away
from Linus' tree right now, and I'm looking forward to 2.6.18 opening
when we should be able to fix that.

thanks,
-Len