From patchwork Thu Jan 26 22:09:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 138074 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 039F4B6F6F for ; Fri, 27 Jan 2012 09:10:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051Ab2AZWJs (ORCPT ); Thu, 26 Jan 2012 17:09:48 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:25982 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333Ab2AZWJr (ORCPT ); Thu, 26 Jan 2012 17:09:47 -0500 Received: from skavurska.sw.ru ([10.30.64.5]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q0QM9S5a020981; Fri, 27 Jan 2012 02:09:29 +0400 (MSK) From: Glauber Costa To: davem@davemloft.net Cc: geert@linux-m68k.org, netdev@vger.kernel.org, sfr@canb.auug.org.au, Glauber Costa Subject: [PATCH] net: explicitly add jump_label.h header to sock.h Date: Fri, 27 Jan 2012 02:09:28 +0400 Message-Id: <1327615768-13709-1-git-send-email-glommer@parallels.com> X-Mailer: git-send-email 1.7.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 36a1211970193ce215de50ed1e4e1272bc814df1 removed linux/module.h include statement from one of the headers that end up in net/sock.h. It was providing us with static_branch() definition implicitly, so after its removal the build got broken. To fix this, and avoid having this happening in the future, let me do the right thing and include linux/jump_label.h explicitly in sock.h. Signed-off-by: Glauber Costa Reported-by: Randy Dunlap CC: David S. Miller --- include/net/sock.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 4c69ac1..91c1c8b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -55,6 +55,7 @@ #include #include #include +#include #include #include