diff options
| author | Mike Travis <mike.travis@hpe.com> | 2020-10-06 23:34:27 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-10-07 08:56:05 +0200 |
| commit | 788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26 (patch) | |
| tree | 18e6b6f14a79c99547c8bed9a3a63e6aba2e5b24 /drivers/misc/sgi-xp/xpnet.c | |
| parent | x86/platform/uv: Remove SCIR MMR references for UV systems (diff) | |
| download | linux-788b66e34e8ab82a93c63a83ba5a9d04f2f4ae26.tar.xz 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/xpnet.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xpnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c index 837d6c3fe69c..8ee39910b309 100644 --- a/drivers/misc/sgi-xp/xpnet.c +++ b/drivers/misc/sgi-xp/xpnet.c @@ -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); |