From patchwork Thu Jan 2 22:58:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 306318 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3152D2C00A2 for ; Fri, 3 Jan 2014 09:58:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751258AbaABW6w (ORCPT ); Thu, 2 Jan 2014 17:58:52 -0500 Received: from mail-pb0-f51.google.com ([209.85.160.51]:36227 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750782AbaABW6v (ORCPT ); Thu, 2 Jan 2014 17:58:51 -0500 Received: by mail-pb0-f51.google.com with SMTP id up15so14884833pbc.24 for ; Thu, 02 Jan 2014 14:58:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=IVji6IsPv+4MrX9391mzRC9qYmXkx8g7rIZFBMean8w=; b=0JqSFeZi6wiv6BbW8LNsro+UXH/BiorjdY5sa/pTk/esEs8o5G/vbmrX7xpzqSs26w alXaN+lvkfnj1Z9UqPBhQVh0A5IbH/Tb6Lt+c2VZObh/svpwoGuQipEMc4fNl7Z7z7f9 EBvch6F5k7HpW0AQHvyfbaq7rDJjhmHcflCQOLOGcnUYxrKwtLOVAf14YpA8MMQQNEJM AwOrgqdLNkSRmbpcx03frvs+QXP6fpKbBe47IQF6kyMqrYN4GQH/fS9QoZYadh7Xyiy3 ExyJRjrszbd2PG0QE0QtpBSlfgYKzp/1BTCtnPECo6WXOvujqWSwd33iuFh9CCw36npT NJ7w== X-Received: by 10.66.254.69 with SMTP id ag5mr30855220pad.112.1388703531064; Thu, 02 Jan 2014 14:58:51 -0800 (PST) Received: from localhost.net ([8.25.197.24]) by mx.google.com with ESMTPSA id ha10sm104305767pbd.17.2014.01.02.14.58.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2014 14:58:50 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Stephen Hemminger , "David S. Miller" Subject: [Patch net-next] net: revert "sched classifier: make cgroup table local" Date: Thu, 2 Jan 2014 14:58:41 -0800 Message-Id: <1388703521-5535-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit de6fb288b1246a5c4e00c0cdbfe3a838a360b3f4. Otherwise we got: net/sched/cls_cgroup.c:106:29: error: static declaration of ‘net_cls_subsys’ follows non-static declaration static struct cgroup_subsys net_cls_subsys = { ^ In file included from include/linux/cgroup.h:654:0, from net/sched/cls_cgroup.c:18: include/linux/cgroup_subsys.h:35:29: note: previous declaration of ‘net_cls_subsys’ was here SUBSYS(net_cls) ^ make[2]: *** [net/sched/cls_cgroup.o] Error 1 Cc: Stephen Hemminger Cc: David S. Miller Signed-off-by: Cong Wang --- net/sched/cls_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 161a03e..f9d21258 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -103,7 +103,7 @@ static struct cftype ss_files[] = { { } /* terminate */ }; -static struct cgroup_subsys net_cls_subsys = { +struct cgroup_subsys net_cls_subsys = { .name = "net_cls", .css_alloc = cgrp_css_alloc, .css_online = cgrp_css_online,