On 10/5/2020 2:16 PM, Borislav Petkov wrote:
On Mon, Oct 05, 2020 at 03:39:19PM -0500, Mike Travis wrote:
Make a small symbol change (is_uv() ==> is_uv_sys()) to accommodate a
change in the uv_mmrs.h file (is_uv() is the new arch selector function).
Signed-off-by: Mike Travis <mike.travis@xxxxxxx>
Reviewed-by: Dimitri Sivanich <dimitri.sivanich@xxxxxxx>
Reviewed-by: Steve Wahl <steve.wahl@xxxxxxx>
---
drivers/misc/sgi-xp/xp.h | 8 ++++----
drivers/misc/sgi-xp/xp_main.c | 4 ++--
drivers/misc/sgi-xp/xp_uv.c | 6 ++++--
drivers/misc/sgi-xp/xpc_main.c | 6 +++---
drivers/misc/sgi-xp/xpc_partition.c | 2 +-
drivers/misc/sgi-xp/xpnet.c | 2 +-
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 06469b12aced..0af267baf031 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -17,11 +17,11 @@
#if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV
#include <asm/uv/uv.h>
-#define is_uv() is_uv_system()
+#define is_uv_sys() is_uv_system()
Do I see it correctly that you can simply use is_uv_system() directly
instead of this macro indirection?
Yes, there was the MACRO is_uv() that conflicted with the automated
"generate uv_mmrs.h" PERL script that also uses it that I changed. I
see now maybe just getting rid of the entire thing in this file might
have been better?
