From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762360AbZCYPe0 (ORCPT ); Wed, 25 Mar 2009 11:34:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759301AbZCYPeS (ORCPT ); Wed, 25 Mar 2009 11:34:18 -0400 Received: from hera.kernel.org ([140.211.167.34]:56430 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757964AbZCYPeR (ORCPT ); Wed, 25 Mar 2009 11:34:17 -0400 Date: Wed, 25 Mar 2009 15:33:28 GMT From: Ingo Molnar To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, penberg@cs.helsinki.fi, eduard.munteanu@linux360.ro, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, penberg@cs.helsinki.fi, eduard.munteanu@linux360.ro, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1237898630.25315.83.camel@penberg-laptop> References: <1237898630.25315.83.camel@penberg-laptop> Subject: [tip:tracing/kmemtrace] fs, kmemtrace: fix linux/fdtable.h header file dependencies Message-ID: Git-Commit-ID: fed06d464b8bd4521f5f59409d866f4916823f73 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 25 Mar 2009 15:33:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fed06d464b8bd4521f5f59409d866f4916823f73 Gitweb: http://git.kernel.org/tip/fed06d464b8bd4521f5f59409d866f4916823f73 Author: Ingo Molnar AuthorDate: Wed, 25 Mar 2009 16:29:05 +0100 Committer: Ingo Molnar CommitDate: Wed, 25 Mar 2009 16:32:25 +0100 fs, kmemtrace: fix linux/fdtable.h header file dependencies Impact: build fix fdtable.h uses __init, but does not include init.h. This can cause build failures on non-x86 architectures: /home/mingo/tip/include/linux/fdtable.h:66: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'files_defer_init' make[2]: *** [fs/locks.o] Error 1 It got this header included indirectly via rcupdate.h's percpu.h inclusion - but that's not there anymore so the build broke. Fix it. Cc: Pekka Enberg Cc: Eduard - Gabriel Munteanu Cc: paulmck@linux.vnet.ibm.com LKML-Reference: <1237898630.25315.83.camel@penberg-laptop> Signed-off-by: Ingo Molnar --- include/linux/fdtable.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index 09d6c5b..a2ec74b 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -5,12 +5,14 @@ #ifndef __LINUX_FDTABLE_H #define __LINUX_FDTABLE_H -#include #include #include #include #include #include +#include + +#include /* * The default fd array needs to be at least BITS_PER_LONG,