From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756366Ab1KNXQQ (ORCPT <rfc822;w@1wt.eu>);
	Mon, 14 Nov 2011 18:16:16 -0500
Received: from ogre.sisk.pl ([217.79.144.158]:39386 "EHLO ogre.sisk.pl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753450Ab1KNXQP (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 14 Nov 2011 18:16:15 -0500
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Subject: Re: [PATCH] PM/Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()
Date: Tue, 15 Nov 2011 00:18:55 +0100
User-Agent: KMail/1.13.6 (Linux/3.1.0-rc10+; KDE/4.6.0; x86_64; ; )
Cc: dhowells@redhat.com, eparis@redhat.com, kay.sievers@vrfy.org,
        jmorris@namei.org, linux-kernel@vger.kernel.org,
        linux-pm@vger.kernel.org
References: <20111110161921.3714.25382.stgit@srivatsabhat.in.ibm.com>
In-Reply-To: <20111110161921.3714.25382.stgit@srivatsabhat.in.ibm.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201111150018.55625.rjw@sisk.pl>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thursday, November 10, 2011, Srivatsa S. Bhat wrote:
> usermodehelper_pm_callback() no longer exists in the kernel. There are 2
> comments in kernel/kmod.c that still refer to it.
> 
> Also, the patch that introduced usermodehelper_pm_callback(), #included
> 2 header files: <linux/notifier.h> and <linux/suspend.h>. But these are
> no longer necessary.
> 
> This patch updates the comments as appropriate and removes the unnecessary
> header file inclusions.
> 
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Applied to linux-pm/linux-next.

Thanks,
Rafael


> ---
> 
>  kernel/kmod.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/kernel/kmod.c b/kernel/kmod.c
> index a4bea97..2142687 100644
> --- a/kernel/kmod.c
> +++ b/kernel/kmod.c
> @@ -34,8 +34,6 @@
>  #include <linux/kernel.h>
>  #include <linux/init.h>
>  #include <linux/resource.h>
> -#include <linux/notifier.h>
> -#include <linux/suspend.h>
>  #include <asm/uaccess.h>
>  
>  #include <trace/events/module.h>
> @@ -282,14 +280,14 @@ static int usermodehelper_disabled = 1;
>  static atomic_t running_helpers = ATOMIC_INIT(0);
>  
>  /*
> - * Wait queue head used by usermodehelper_pm_callback() to wait for all running
> + * Wait queue head used by usermodehelper_disable() to wait for all running
>   * helpers to finish.
>   */
>  static DECLARE_WAIT_QUEUE_HEAD(running_helpers_waitq);
>  
>  /*
>   * Time to wait for running_helpers to become zero before the setting of
> - * usermodehelper_disabled in usermodehelper_pm_callback() fails
> + * usermodehelper_disabled in usermodehelper_disable() fails
>   */
>  #define RUNNING_HELPERS_TIMEOUT	(5 * HZ)
>  
> 
> 
>