mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

drivers/misc/sgi-xp: Adjust references in UV kernel modules

Browse source 
Remove the define is_uv() is_uv_system and just use the latter as is.
This removes a conflict with a new symbol in the generated uv_mmrs.h
file (is_uv()).

Signed-off-by: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Link: https://lkml.kernel.org/r/20201005203929.148656-4-mike.travis@hpe.com
This commit is contained in:
Mike Travis 2020-10-06 16:34:27 -05:00 committed by Borislav Petkov
parent c4d9807744
commit 788b66e34e
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/misc/sgi-xp/xp.h
View file

@ -17,11 +17,6 @@
#if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV
#include <asm/uv/uv.h>
#define is_uv() is_uv_system()
#endif
#ifndef is_uv
#define is_uv() 0
#endif
#ifdef USE_DBUG_ON
@ -79,7 +74,7 @@
#define XPC_MSG_SIZE(_payload_size) \
ALIGN(XPC_MSG_HDR_MAX_SIZE + (_payload_size), \
is_uv() ? 64 : 128)
is_uv_system() ? 64 : 128)
/*

4
drivers/misc/sgi-xp/xp_main.c
View file

@ -233,7 +233,7 @@ xp_init(void)
for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
mutex_init(&xpc_registrations[ch_number].mutex);
if (is_uv())
if (is_uv_system())
ret = xp_init_uv();
else
ret = 0;
@ -249,7 +249,7 @@ module_init(xp_init);
static void __exit
xp_exit(void)
{
if (is_uv())
if (is_uv_system())
xp_exit_uv();
}

6
drivers/misc/sgi-xp/xp_uv.c
View file

@ -148,7 +148,9 @@ xp_restrict_memprotect_uv(unsigned long phys_addr, unsigned long size)
enum xp_retval
xp_init_uv(void)
{
BUG_ON(!is_uv());
WARN_ON(!is_uv_system());
if (!is_uv_system())
return xpUnsupported;
xp_max_npartitions = XP_MAX_NPARTITIONS_UV;
#ifdef CONFIG_X86
@ -168,5 +170,5 @@ xp_init_uv(void)
void
xp_exit_uv(void)
{
BUG_ON(!is_uv());
WARN_ON(!is_uv_system());
}

6
drivers/misc/sgi-xp/xpc_main.c
View file

@ -1043,7 +1043,7 @@ xpc_do_exit(enum xp_retval reason)
xpc_teardown_partitions();
if (is_uv())
if (is_uv_system())
xpc_exit_uv();
}
@ -1226,7 +1226,7 @@ xpc_init(void)
dev_set_name(xpc_part, "part");
dev_set_name(xpc_chan, "chan");
if (is_uv()) {
if (is_uv_system()) {
ret = xpc_init_uv();
} else {
@ -1312,7 +1312,7 @@ xpc_init(void)
xpc_teardown_partitions();
out_1:
if (is_uv())
if (is_uv_system())
xpc_exit_uv();
return ret;
}

2
drivers/misc/sgi-xp/xpc_partition.c
View file

@ -433,7 +433,7 @@ xpc_discovery(void)
*/
region_size = xp_region_size;
if (is_uv())
if (is_uv_system())
max_regions = 256;
else {
max_regions = 64;

2
drivers/misc/sgi-xp/xpnet.c
View file

@ -515,7 +515,7 @@ xpnet_init(void)
{
int result;
if (!is_uv())
if (!is_uv_system())
return -ENODEV;
dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);