diff options
| author | Mike Travis <mike.travis@hpe.com> | 2020-10-06 16:34:27 -0500 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-10-07 08:56:05 +0200 |
| commit | 788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26 (patch) | |
| tree | 18e6b6f14a79c99547c8bed9a3a63e6aba2e5b24 /drivers/misc/sgi-xp/xp_uv.c | |
| parent | c4d98077443adf61268ffb8b2c5d63c6176d845f (diff) | |
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_uv.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xp_uv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/sgi-xp/xp_uv.c b/drivers/misc/sgi-xp/xp_uv.c index f15a9f2ac1dd..5dcca03b26cb 100644 --- a/drivers/misc/sgi-xp/xp_uv.c +++ b/drivers/misc/sgi-xp/xp_uv.c @@ -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()); } |