Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b608f87f authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86/platform/UV: Clean up redunduncies after merge of UV4 MMR definitions 



Clean up any redundancies caused by new UV4 MMR definitions superseding
any previously definitions local to functions.

Tested-by: default avatarJohn Estabrook <estabrook@sgi.com>
Tested-by: default avatarGary Kroening <gfk@sgi.com>
Tested-by: default avatarNathan Zimmer <nzimmer@sgi.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Reviewed-by: default avatarAndrew Banman <abanman@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160429215403.934728974@asylum.americas.sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0f0d84c0

arch/x86/include/asm/uv/uv_hub.h

+0 −9
Original line number Diff line number Diff line
@@ -549,8 +549,6 @@ struct uv_blade_info { 
	unsigned short	nr_online_cpus;

	unsigned short	pnode;

	short		memory_nid;

	spinlock_t	nmi_lock;	/* obsolete, see uv_hub_nmi */

	unsigned long	nmi_count;	/* obsolete, see uv_hub_nmi */

};

extern struct uv_blade_info *uv_blade_info;

extern short *uv_node_to_blade;
@@ -635,14 +633,7 @@ extern void uv_nmi_setup(void); 
/* Newer SMM NMI handler, not present in all systems */

#define UVH_NMI_MMRX		UVH_EVENT_OCCURRED0

#define UVH_NMI_MMRX_CLEAR	UVH_EVENT_OCCURRED0_ALIAS



#ifdef	UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT

#define UVH_NMI_MMRX_SHIFT	UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT

#else

#define UVH_NMI_MMRX_SHIFT	(is_uv1_hub() ? \

					UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :\

					UVXH_EVENT_OCCURRED0_EXTIO_INT0_SHFT)

#endif

#define	UVH_NMI_MMRX_TYPE	"EXTIO_INT0"



/* Non-zero indicates newer SMM NMI handler present */

arch/x86/kernel/apic/x2apic_uv_x.c

+0 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,6 @@ void __init uv_system_init(void) 
			uv_blade_info[blade].pnode = pnode;

			uv_blade_info[blade].nr_possible_cpus = 0;

			uv_blade_info[blade].nr_online_cpus = 0;

			spin_lock_init(&uv_blade_info[blade].nmi_lock);

			min_pnode = min(pnode, min_pnode);

			max_pnode = max(pnode, max_pnode);

			blade++;