diff options
| author | Mike Travis <mike.travis@hpe.com> | 2020-10-07 00:34:27 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-10-07 09:56:05 +0300 |
| commit | 788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26 (patch) | |
| tree | 18e6b6f14a79c99547c8bed9a3a63e6aba2e5b24 /drivers/misc/sgi-xp/xp_main.c | |
| parent | c4d98077443adf61268ffb8b2c5d63c6176d845f (diff) | |
| download | linux-788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26.tar.xz | |
drivers/misc/sgi-xp: Adjust references in UV kernel modules
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
Diffstat (limited to 'drivers/misc/sgi-xp/xp_main.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xp_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c index 61b03fcefb13..0eea2f518967 100644 --- a/drivers/misc/sgi-xp/xp_main.c +++ b/drivers/misc/sgi-xp/xp_main.c @@ -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(); } |