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

Commit 0918cf03 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove kp30.h 



It's empty, so remove it and move the #include lines into the one file
that used to include this header.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55f5a824

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,6 @@ int cfs_match_nid(lnet_nid_t nid, struct list_head *list); 
/* --------------------------------------------------------------------

/* --------------------------------------------------------------------

 * Light-weight trace

 * Light-weight trace

 * Support for temporary event tracing with minimal Heisenberg effect.

 * Support for temporary event tracing with minimal Heisenberg effect.

 * All stuff about lwt are put in arch/kp30.h

 * -------------------------------------------------------------------- */

 * -------------------------------------------------------------------- */





struct libcfs_device_userstate

struct libcfs_device_userstate

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

deleted100644 → 0
+0 −71
Original line number Original line 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.

 */



#ifndef __LIBCFS_LINUX_KP30_H__

#define __LIBCFS_LINUX_KP30_H__



#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/string.h>

#include <linux/stat.h>

#include <linux/errno.h>

#include <linux/unistd.h>

#include <linux/kmod.h>

#include <linux/notifier.h>

#include <linux/fs.h>

#include <linux/miscdevice.h>

#include <linux/vmalloc.h>

#include <linux/time.h>

#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/highmem.h>

#include <linux/module.h>

#include <asm/atomic.h>

#include <asm/uaccess.h>

#include <linux/rwsem.h>

#include <linux/proc_fs.h>

#include <linux/file.h>

#include <linux/smp.h>

#include <linux/ctype.h>

#include <linux/compiler.h>

#include <linux/mm_inline.h>

#include <linux/kallsyms.h>

#include <linux/moduleparam.h>

#include <linux/scatterlist.h>



#include "portals_compat25.h"



#endif

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

+23 −1
Original line number Original line Diff line number Diff line
@@ -43,29 +43,51 @@ 








#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/ctype.h>

#include <linux/errno.h>

#include <linux/file.h>

#include <linux/fs.h>

#include <linux/highmem.h>

#include <linux/interrupt.h>

#include <linux/kallsyms.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/kmod.h>

#include <linux/kthread.h>

#include <linux/kthread.h>

#include <linux/miscdevice.h>

#include <linux/miscdevice.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/mm_inline.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/notifier.h>

#include <linux/proc_fs.h>

#include <linux/proc_fs.h>

#include <linux/random.h>

#include <linux/random.h>

#include <linux/rbtree.h>

#include <linux/rbtree.h>

#include <linux/rwsem.h>

#include <linux/scatterlist.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/signal.h>

#include <linux/signal.h>

#include <linux/slab.h>

#include <linux/smp.h>

#include <linux/stat.h>

#include <linux/string.h>

#include <linux/time.h>

#include <linux/timer.h>

#include <linux/timer.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/unistd.h>

#include <linux/vmalloc.h>

#include <net/sock.h>

#include <net/sock.h>

#include <asm/atomic.h>

#include <asm/div64.h>

#include <asm/div64.h>

#include <asm/timex.h>

#include <asm/timex.h>

#include <asm/uaccess.h>

#include <stdarg.h>

#include <stdarg.h>

#include "linux-cpu.h"

#include "linux-cpu.h"

#include "linux-time.h"

#include "linux-time.h"

#include "linux-mem.h"

#include "linux-mem.h"

#include "portals_compat25.h"

#include "portals_compat25.h"





#include "kp30.h"





#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)

#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)