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.h | |
| parent | c4d98077443adf61268ffb8b2c5d63c6176d845f (diff) | |
| download | linux-788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26.tar.gz linux-788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26.tar.bz2 linux-788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26.zip | |
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.h')
| -rw-r--r-- | drivers/misc/sgi-xp/xp.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h index 06469b12aced..2b6aabc61c6a 100644 --- a/drivers/misc/sgi-xp/xp.h +++ b/drivers/misc/sgi-xp/xp.h @@ -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) /* |