Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 899e1a31 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: delete linux-mem.h 



The header linux-mem.h is no longer needed.

Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: http://review.whamcloud.com/13841


Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c89dc06

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+1 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <linux/moduleparam.h>

#include <linux/mutex.h>

#include <linux/notifier.h>

#include <linux/pagemap.h>

#include <linux/random.h>

#include <linux/rbtree.h>

#include <linux/rwsem.h>
@@ -83,7 +84,6 @@ 
#include <stdarg.h>

#include "linux-cpu.h"

#include "linux-time.h"

#include "linux-mem.h"



#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)

drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * libcfs/include/libcfs/linux/linux-mem.h

 * libcfs/include/libcfs/linux/linux-cpu.h

 *

 * Basic library routines.

 *

drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * GPL HEADER START

 *

 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 only,

 * as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License version 2 for more details (a copy is included

 * in the LICENSE file that accompanied this code).

 *

 * You should have received a copy of the GNU General Public License

 * version 2 along with this program; If not, see

 * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf

 *

 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,

 * CA 95054 USA or visit www.sun.com if you need additional information or

 * have any questions.

 *

 * GPL HEADER END

 */

/*

 * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 *

 * Copyright (c) 2011, 2012, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * libcfs/include/libcfs/linux/linux-mem.h

 *

 * Basic library routines.

 */



#ifndef __LIBCFS_LINUX_CFS_MEM_H__

#define __LIBCFS_LINUX_CFS_MEM_H__



#ifndef __LIBCFS_LIBCFS_H__

#error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead

#endif



#include <linux/mm.h>

#include <linux/vmalloc.h>

#include <linux/pagemap.h>

#include <linux/slab.h>

#include <linux/memcontrol.h>

#include <linux/mm_inline.h>



#ifndef HAVE_LIBCFS_CPT

/* Need this for cfs_cpt_table */

#include "../libcfs_cpu.h"

#endif



#endif /* __LINUX_CFS_MEM_H__ */