From patchwork Fri Sep 24 21:46:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Lord X-Patchwork-Id: 65701 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 29C71B70F9 for ; Sat, 25 Sep 2010 07:48:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463Ab0IXVsP (ORCPT ); Fri, 24 Sep 2010 17:48:15 -0400 Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:49965 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753198Ab0IXVsO (ORCPT ); Fri, 24 Sep 2010 17:48:14 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id 9AD2CD9498; Fri, 24 Sep 2010 17:48:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=subject:from :to:cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; s=sasl; bh=E7XmulChMmC+ BPpzUchbKzdV32o=; b=cms3ql1zU3cyD1Nran2c5ADqbUrQMA6fi8wqwmsL764K 1KliQOIYZTTbPdlKN6ugi7pIPR9mmyxA6CcISMjs5Zl+NATNw/L6RAI4L7fzBq/z x6tPxQKtyMoQWa+osIXyK78cta7t/Lay3+wADKzsa4pTPmTT+0k0M9IWkT9Jjes= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=subject:from:to :cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; q=dns; s=sasl; b=tsILRf zAMzyd8q5VNAK//1PNZslWCHqtL6m1mCKsh3B3DKSNtah8+eOvg2VvE/Gx8ioDit nNDh0sK5+BwQl541FgpYmKfzk69TIZi64TRhnk4xFCcHeOmEJyGOke27QacRusou 67BtoJjHMdKrdmCtCXGV++Rv2EE7S6m8Qe+FI= Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id 589DBD9492; Fri, 24 Sep 2010 17:48:10 -0400 (EDT) Received: from [10.0.0.6] (unknown [75.119.251.23]) (using SSLv3 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTPSA id CD763D948B; Fri, 24 Sep 2010 17:48:01 -0400 (EDT) Subject: [PATCH] fix blk-exec.c compile error: always define 'sysctl_hung_task_timeout_secs' (resend) From: Mark Lord To: Vivek Goyal , Jens Axboe Cc: linux-kernel@vger.kernel.org, hch@lst.de, IDE/ATA development list In-Reply-To: <20100924202106.GC7145@redhat.com> References: <1285271646-2768-1-git-send-email-vgoyal@redhat.com> <4C9CEFD6.3000106@kernel.dk> <20100924202106.GC7145@redhat.com> Organization: Real-Time Remedies Inc. Date: Fri, 24 Sep 2010 17:46:37 -0400 Message-ID: <1285364797.12723.1.camel@corey> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-Pobox-Relay-ID: 6C74DC14-C825-11DF-A0EB-030CEE7EF46B-82205200!a-pb-sasl-quonix.pobox.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Ensure that 'sysctl_hung_task_timeout_secs' is defined even when CONFIG_DETECT_HUNG_TASK is not set. This way we can safely reference it without need for ifdefs in the code elsewhere. eg. in block/blk-exec.c Signed-off-by: Mark Lord (Resending from a repaired email client.) Jens: my apologies for not catching this this earlier. --- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/include/linux/sched.h 2010-09-20 19:56:53.000000000 -0400 +++ b/include/linux/sched.h 2010-09-24 17:22:01.707291995 -0400 @@ -336,6 +336,9 @@ extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); +#else +/* Avoid need for ifdefs elsewhere in the code */ +enum { sysctl_hung_task_timeout_secs = 0 }; #endif /* Attach to any functions which should be ignored in wchan output. */