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

Commit f11e1de2 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove {linux,posix}-tracefile.h 



Move the definition of the trace buffer type enum in
libcfs/libcfs/tracefile.h.  Remove the then unneeded headers
libcfs/libcfs/linux/linux-tracefile.h and
libcfs/libcfs/posix/posix-tracefile.h.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11983


Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dc563a6

drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h

deleted100644 → 0
+0 −48
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) 2009, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 */

/*

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

 * Lustre is a trademark of Sun Microsystems, Inc.

 */



#ifndef __LIBCFS_LINUX_TRACEFILE_H__

#define __LIBCFS_LINUX_TRACEFILE_H__



/**

 * three types of trace_data in linux

 */

typedef enum {

	CFS_TCD_TYPE_PROC = 0,

	CFS_TCD_TYPE_SOFTIRQ,

	CFS_TCD_TYPE_IRQ,

	CFS_TCD_TYPE_MAX

} cfs_trace_buf_type_t;



#endif

drivers/staging/lustre/lustre/libcfs/tracefile.h

+6 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,12 @@ 




#include "../../include/linux/libcfs/libcfs.h"

#include "../../include/linux/libcfs/libcfs.h"





#include "linux/linux-tracefile.h"

typedef enum {

	CFS_TCD_TYPE_PROC = 0,

	CFS_TCD_TYPE_SOFTIRQ,

	CFS_TCD_TYPE_IRQ,

	CFS_TCD_TYPE_MAX

} cfs_trace_buf_type_t;





/* trace file lock routines */

/* trace file lock routines */