Commit eba85728 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove include/linux/libcfs/linux/linux-cpu.h 



This include file contains definitions used when CONFIG_SMP
is in effect.  Other includes contain corresponding definitions
for when it isn't.
This can be hard to follow, so move the definitions to the one place.

As HAVE_LIBCFS_CPT is defined precisely when CONFIG_SMP, we discard
that macro and just use CONFIG_SMP when needed.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55161065

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

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

#include <linux/uaccess.h>

#include <stdarg.h>

#include <linux/libcfs/linux/linux-cpu.h>



#include <linux/libcfs/libcfs_debug.h>

#include <linux/libcfs/libcfs_private.h>

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

+33 −0
Original line number Diff line number Diff line
@@ -72,10 +72,43 @@ 
#ifndef __LIBCFS_CPU_H__

#define __LIBCFS_CPU_H__



#include <linux/cpu.h>

#include <linux/cpuset.h>

#include <linux/topology.h>



/* any CPU partition */

#define CFS_CPT_ANY		(-1)



#ifdef CONFIG_SMP

/** virtual processing unit */

struct cfs_cpu_partition {

	/* CPUs mask for this partition */

	cpumask_var_t			cpt_cpumask;

	/* nodes mask for this partition */

	nodemask_t			*cpt_nodemask;

	/* spread rotor for NUMA allocator */

	unsigned int			cpt_spread_rotor;

};





/** descriptor for CPU partitions */

struct cfs_cpt_table {

	/* version, reserved for hotplug */

	unsigned int			ctb_version;

	/* spread rotor for NUMA allocator */

	unsigned int			ctb_spread_rotor;

	/* # of CPU partitions */

	unsigned int			ctb_nparts;

	/* partitions tables */

	struct cfs_cpu_partition	*ctb_parts;

	/* shadow HW CPU to CPU partition ID */

	int				*ctb_cpu2cpt;

	/* all cpus in this partition table */

	cpumask_var_t			ctb_cpumask;

	/* all nodes in this partition table */

	nodemask_t			*ctb_nodemask;

};



/**

 * return cpumask of CPU partition \a cpt

 */

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

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * 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).

 *

 * GPL HEADER END

 */

/*

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

 * Copyright (c) 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-cpu.h

 *

 * Basic library routines.

 *

 * Author: liang@whamcloud.com

 */



#ifndef __LIBCFS_LINUX_CPU_H__

#define __LIBCFS_LINUX_CPU_H__



#ifndef __LIBCFS_LIBCFS_H__

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

#endif



#include <linux/cpu.h>

#include <linux/cpuset.h>

#include <linux/topology.h>



#ifdef CONFIG_SMP



#define HAVE_LIBCFS_CPT



/** virtual processing unit */

struct cfs_cpu_partition {

	/* CPUs mask for this partition */

	cpumask_var_t			cpt_cpumask;

	/* nodes mask for this partition */

	nodemask_t			*cpt_nodemask;

	/* spread rotor for NUMA allocator */

	unsigned int			cpt_spread_rotor;

};



/** descriptor for CPU partitions */

struct cfs_cpt_table {

	/* version, reserved for hotplug */

	unsigned int			ctb_version;

	/* spread rotor for NUMA allocator */

	unsigned int			ctb_spread_rotor;

	/* # of CPU partitions */

	unsigned int			ctb_nparts;

	/* partitions tables */

	struct cfs_cpu_partition	*ctb_parts;

	/* shadow HW CPU to CPU partition ID */

	int				*ctb_cpu2cpt;

	/* all cpus in this partition table */

	cpumask_var_t			ctb_cpumask;

	/* all nodes in this partition table */

	nodemask_t			*ctb_nodemask;

};



#endif /* CONFIG_SMP */

#endif /* __LIBCFS_LINUX_CPU_H__ */

drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
struct cfs_cpt_table   *cfs_cpt_table __read_mostly;

EXPORT_SYMBOL(cfs_cpt_table);



#ifndef HAVE_LIBCFS_CPT

#ifndef CONFIG_SMP



#define CFS_CPU_VERSION_MAGIC	   0xbabecafe
@@ -225,4 +225,4 @@ cfs_cpu_init(void) 
	return cfs_cpt_table ? 0 : -1;

}



#endif /* HAVE_LIBCFS_CPT */
 
#endif /* CONFIG_SMP */

CRA Git | Maintained and supported by SUSTech CRA and CCSE