From patchwork Tue Sep 11 09:41:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 11303 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D1DE123E02 for ; Tue, 11 Sep 2012 09:41:54 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7AB69A18180 for ; Tue, 11 Sep 2012 09:41:54 +0000 (UTC) Received: by ieak11 with SMTP id k11so518155iea.11 for ; Tue, 11 Sep 2012 02:41:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:x-gm-message-state; bh=APFAgFo5ToMFUBFwP5Hw+FeuTt+GIYTE5/MDIalTRDs=; b=P5F4nI4vaREWQy1OlONzqOFMg7roOjEhP6LJwcrquis5NmAFciL57Qlxe9BUzT++N1 IYa2ZlbqO/JRk0rdP9d9cg6mJ6DXpkkDIRzX/4lzL0/RLMRe7STN1cESzRz4Z0SAcAVu wwg8OCqDt3tGqBszEYAR6f7RYB4m7NWORYlb4aWxsU6gfqSoErgiE6vNR8GgCl0Svcb/ csuNoOLewSOCMGU2e+ap+9/b7eLwKEJstp3Qh9ip9AOl2ZTiIhB0ftFrOY5YWTueZKz8 JxPp/rcHnRwIKyv5uOC0h25XjyAm+kGOkbS2SZ9M7wLdc7hKQWZuGmfQ2IRVLjDIY6tg AAyg== Received: by 10.50.217.227 with SMTP id pb3mr15152371igc.28.1347356513822; Tue, 11 Sep 2012 02:41:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp4865igc; Tue, 11 Sep 2012 02:41:53 -0700 (PDT) Received: by 10.58.91.102 with SMTP id cd6mr26032651veb.58.1347356512965; Tue, 11 Sep 2012 02:41:52 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id nr20si14938669vcb.67.2012.09.11.02.41.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Sep 2012 02:41:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.212.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by vbnl22 with SMTP id l22so482453vbn.37 for ; Tue, 11 Sep 2012 02:41:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.52.100.5 with SMTP id eu5mr8263966vdb.34.1347356512580; Tue, 11 Sep 2012 02:41:52 -0700 (PDT) Received: by 10.58.198.169 with HTTP; Tue, 11 Sep 2012 02:41:52 -0700 (PDT) In-Reply-To: <1347350934-17712-1-git-send-email-sachin.kamat@linaro.org> References: <1347350934-17712-1-git-send-email-sachin.kamat@linaro.org> Date: Tue, 11 Sep 2012 15:11:52 +0530 Message-ID: Subject: [PATCH] mm/memcontrol.c: Remove duplicate inclusion of sock.h file From: Sachin Kamat To: Patch Tracking X-Gm-Message-State: ALoCoQlLXApha4gW8xI+PpiJ4aFzsIRA3djwkuze3hnnnTCV085wLLyWUJ/4l51zLacKTNI3ieJo net/sock.h is included unconditionally at the beginning of the file. Hence, another conditional include is not required. Cc: Johannes Weiner Cc: Michal Hocko Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Cc: Andrew Morton Signed-off-by: Sachin Kamat --- mm/memcontrol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) static bool mem_cgroup_is_root(struct mem_cgroup *memcg); -- 1.7.4.1 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 795e525..d5e76f5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -413,7 +413,6 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) /* Writing them here to avoid exposing memcg's inner layout */ #ifdef CONFIG_MEMCG_KMEM -#include #include