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

Commit 25dc0049 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, smp: refactor ->inquire_remote_apic() methods 



Nothing exciting - a few subarches dont want APIC remote reads to
be performed - the others are content with the default method.

 - extend the generic code to handle NULL methods

 - clear out dummy methods and replace them with NULL

 - clean up: remove wrapper macros, etc.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3d5f597e

arch/x86/include/asm/es7000/wakecpu.h

+0 −8
Original line number Diff line number Diff line
@@ -13,12 +13,4 @@ static inline void es7000_wait_for_init_deassert(atomic_t *deassert) 
	return;

}



extern void __inquire_remote_apic(int apicid);



static inline void inquire_remote_apic(int apicid)

{

	if (apic_verbosity >= APIC_DEBUG)

		__inquire_remote_apic(apicid);

}



#endif /* __ASM_MACH_WAKECPU_H */

arch/x86/include/asm/mach-default/mach_wakecpu.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static inline void __inquire_remote_apic(int apicid) 
}

#endif /* CONFIG_SMP */



static inline void inquire_remote_apic(int apicid)

static inline void default_inquire_remote_apic(int apicid)

{

	if (apic_verbosity >= APIC_DEBUG)

		__inquire_remote_apic(apicid);

arch/x86/include/asm/mach-generic/mach_wakecpu.h

+0 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H

#define _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H



#define inquire_remote_apic (apic->inquire_remote_apic)



#endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */

arch/x86/include/asm/numaq/wakecpu.h

+0 −4
Original line number Diff line number Diff line
@@ -25,8 +25,4 @@ numaq_store_NMI_vector(unsigned short *high, unsigned short *low) 
	  *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW));

}



static inline void inquire_remote_apic(int apicid)

{

}



#endif /* __ASM_NUMAQ_WAKECPU_H */

arch/x86/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -876,8 +876,8 @@ do_rest: 
			else

				/* trampoline code not run */

				printk(KERN_ERR "Not responding.\n");

			if (get_uv_system_type() != UV_NON_UNIQUE_APIC)

				inquire_remote_apic(apicid);

			if (apic->inquire_remote_apic)

				apic->inquire_remote_apic(apicid);

		}

	}