[PATCH] Remove unneeded #defines in head.S (1d086e6b) · Commits · 戴 / test

arch/ppc64/kernel/head.S #defines SECONDARY_PROCESSORS then has some #ifdefs based on it. Whatever purpose this had is long lost, this patch removes it. Likewise, head.S defines H_SET_ASR, which is now defined, along with other hypervisor call numbers in hvcall.h. This patch deletes it, as well, from head.S. Signed-off-by:

David Gibson <dwg@au1.ibm.com> Signed-off-by:

Paul Mackerras <paulus@samba.org>

arch/ppc64/kernel/head.S

+0 −11

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@
		* 2 of the License, or (at your option) any later version.
		*/

		#define SECONDARY_PROCESSORS

		#include <linux/config.h>
		#include <linux/threads.h>
		#include <asm/processor.h>
		@@ -43,11 +41,6 @@
		#define DO_SOFT_DISABLE
		#endif

		/*
		* hcall interface to pSeries LPAR
		*/
		#define H_SET_ASR 0x30

		/*
		* We layout physical memory as follows:
		* 0x0000 - 0x00ff : Secondary processor spin code
		@@ -629,9 +622,7 @@ system_reset_iSeries:

		cmpwi 0,r23,0
		beq iSeries_secondary_smp_loop /* Loop until told to go */
		#ifdef SECONDARY_PROCESSORS
		bne .__secondary_start /* Loop until told to go */
		#endif
		iSeries_secondary_smp_loop:
		/* Let the Hypervisor know we are alive */
		/* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
		@@ -1325,9 +1316,7 @@ _GLOBAL(pSeries_secondary_smp_init)

		cmpwi 0,r23,0
		#ifdef CONFIG_SMP
		#ifdef SECONDARY_PROCESSORS
		bne .__secondary_start
		#endif
		#endif
		b 3b /* Loop until told to go */

Admin message