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

Commit d0175ab6 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Andi Kleen
Browse files

[PATCH] i386: Remove smp_alt_instructions 



The .smp_altinstructions section and its corresponding symbols are
completely unused, so remove them.

Also, remove stray #ifdef __KENREL__ in asm-i386/alternative.h

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
parent 4bc5aa91

arch/i386/kernel/alternative.c

+2 −36
Original line number Diff line number Diff line
@@ -132,11 +132,8 @@ static void nop_out(void *insns, unsigned int len) 
}



extern struct alt_instr __alt_instructions[], __alt_instructions_end[];

extern struct alt_instr __smp_alt_instructions[], __smp_alt_instructions_end[];

extern u8 *__smp_locks[], *__smp_locks_end[];



extern u8 __smp_alt_begin[], __smp_alt_end[];



/* Replace instructions with better alternatives for this CPU type.

   This runs before SMP is initialized to avoid SMP problems with

   self modifying code. This implies that assymetric systems where
@@ -171,29 +168,6 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end) 


#ifdef CONFIG_SMP



static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end)

{

	struct alt_instr *a;



	DPRINTK("%s: alt table %p-%p\n", __FUNCTION__, start, end);

	for (a = start; a < end; a++) {

		memcpy(a->replacement + a->replacementlen,

		       a->instr,

		       a->instrlen);

	}

}



static void alternatives_smp_apply(struct alt_instr *start, struct alt_instr *end)

{

	struct alt_instr *a;



	for (a = start; a < end; a++) {

		memcpy(a->instr,

		       a->replacement + a->replacementlen,

		       a->instrlen);

	}

}



static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)

{

	u8 **ptr;
@@ -319,8 +293,6 @@ void alternatives_smp_switch(int smp) 
		printk(KERN_INFO "SMP alternatives: switching to SMP code\n");

		clear_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

		clear_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

		alternatives_smp_apply(__smp_alt_instructions,

				       __smp_alt_instructions_end);

		list_for_each_entry(mod, &smp_alt_modules, next)

			alternatives_smp_lock(mod->locks, mod->locks_end,

					      mod->text, mod->text_end);
@@ -328,8 +300,6 @@ void alternatives_smp_switch(int smp) 
		printk(KERN_INFO "SMP alternatives: switching to UP code\n");

		set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

		set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

		apply_alternatives(__smp_alt_instructions,

				   __smp_alt_instructions_end);

		list_for_each_entry(mod, &smp_alt_modules, next)

			alternatives_smp_unlock(mod->locks, mod->locks_end,

						mod->text, mod->text_end);
@@ -396,17 +366,13 @@ void __init alternative_instructions(void) 
			printk(KERN_INFO "SMP alternatives: switching to UP code\n");

			set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability);

			set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability);

			apply_alternatives(__smp_alt_instructions,

					   __smp_alt_instructions_end);

			alternatives_smp_unlock(__smp_locks, __smp_locks_end,

						_text, _etext);

		}

		free_init_pages("SMP alternatives",

				__pa_symbol(&__smp_alt_begin),

				__pa_symbol(&__smp_alt_end));

				__pa_symbol(&__smp_locks),

				__pa_symbol(&__smp_locks_end));

	} else {

		alternatives_smp_save(__smp_alt_instructions,

				      __smp_alt_instructions_end);

		alternatives_smp_module_add(NULL, "core kernel",

					    __smp_locks, __smp_locks_end,

					    _text, _etext);

arch/i386/kernel/vmlinux.lds.S

+0 −11
Original line number Diff line number Diff line
@@ -117,22 +117,11 @@ SECTIONS 


  /* might get freed after init */

  . = ALIGN(4096);

  .smp_altinstructions : AT(ADDR(.smp_altinstructions) - LOAD_OFFSET) {

	__smp_alt_begin = .;

	__smp_alt_instructions = .;

	*(.smp_altinstructions)

	__smp_alt_instructions_end = .;

  }

  . = ALIGN(4);

  .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {

  	__smp_locks = .;

	*(.smp_locks)

	__smp_locks_end = .;

  }

  .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) {

	*(.smp_altinstr_replacement)

  	__smp_alt_end = .;

  }

  /* will be freed after init

   * Following ALIGN() is required to make sure no other data falls on the

   * same page where __smp_alt_end is pointing as that page might be freed

include/asm-i386/alternative.h

+1 −5
Original line number Diff line number Diff line 
#ifndef _I386_ALTERNATIVE_H

#define _I386_ALTERNATIVE_H



#ifdef __KERNEL__



#include <asm/types.h>

#include <linux/stddef.h>

#include <linux/types.h>
@@ -32,9 +30,7 @@ static inline void alternatives_smp_module_add(struct module *mod, char *name, 
					void *text, void *text_end) {}

static inline void alternatives_smp_module_del(struct module *mod) {}

static inline void alternatives_smp_switch(int smp) {}

#endif



#endif

#endif	/* CONFIG_SMP */



/*

 * Alternative instructions for different CPU types or capabilities.