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

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

[PATCH] x86: PARAVIRT: Jeremy Fitzhardinge <jeremy@goop.org> 



The other symbols used to delineate the alt-instructions sections have the
form __foo/__foo_end.  Rename parainstructions to match.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e0bb8643

arch/i386/kernel/alternative.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -399,6 +399,6 @@ void __init alternative_instructions(void) 
		alternatives_smp_switch(0);

		alternatives_smp_switch(0);

	}

	}

#endif

#endif

 	apply_paravirt(__start_parainstructions, __stop_parainstructions);

 	apply_paravirt(__parainstructions, __parainstructions_end);

	local_irq_restore(flags);

	local_irq_restore(flags);

}
 
}

arch/i386/kernel/vmi.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -73,10 +73,6 @@ static struct { 
  	void (*set_lazy_mode)(int mode);

  	void (*set_lazy_mode)(int mode);

} vmi_ops;

} vmi_ops;





/* XXX move this to alternative.h */

extern struct paravirt_patch __start_parainstructions[],

	__stop_parainstructions[];



/* Cached VMI operations */

/* Cached VMI operations */

struct vmi_timer_ops vmi_timer_ops;

struct vmi_timer_ops vmi_timer_ops;
@@ -548,9 +544,9 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip, 
}

}

#endif

#endif





static void vmi_set_lazy_mode(int mode)

static void vmi_set_lazy_mode(enum paravirt_lazy_mode mode)

{

{

	static DEFINE_PER_CPU(int, lazy_mode);

	static DEFINE_PER_CPU(enum paravirt_lazy_mode, lazy_mode);





	if (!vmi_ops.set_lazy_mode)

	if (!vmi_ops.set_lazy_mode)

		return;

		return;
@@ -912,7 +908,7 @@ static inline int __init activate_vmi(void) 
	 * to do this before IRQs get reenabled.  Fortunately, it is

	 * to do this before IRQs get reenabled.  Fortunately, it is

	 * idempotent.

	 * idempotent.

	 */

	 */

	apply_paravirt(__start_parainstructions, __stop_parainstructions);

	apply_paravirt(__parainstructions, __parainstructions_end);





	vmi_bringup();

	vmi_bringup();

arch/i386/kernel/vmlinux.lds.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -166,9 +166,9 @@ SECTIONS 
  }

  }

  . = ALIGN(4);

  . = ALIGN(4);

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

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

  	__start_parainstructions = .;

  	__parainstructions = .;

	*(.parainstructions)

	*(.parainstructions)

  	__stop_parainstructions = .;

  	__parainstructions_end = .;

  }

  }

  /* .exit.text is discard at runtime, not link time, to deal with references

  /* .exit.text is discard at runtime, not link time, to deal with references

     from .altinstructions and .eh_frame */

     from .altinstructions and .eh_frame */

include/asm-i386/alternative.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -124,8 +124,8 @@ static inline void 
apply_paravirt(struct paravirt_patch_site *start,

apply_paravirt(struct paravirt_patch_site *start,

	       struct paravirt_patch_site *end)

	       struct paravirt_patch_site *end)

{}

{}

#define __start_parainstructions NULL

#define __parainstructions	NULL

#define __stop_parainstructions NULL

#define __parainstructions_end	NULL

#endif

#endif





#endif /* _I386_ALTERNATIVE_H */
 
#endif /* _I386_ALTERNATIVE_H */

include/asm-x86_64/alternative.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -142,8 +142,8 @@ void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end); 
static inline void

static inline void

apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)

apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)

{}

{}

#define __start_parainstructions NULL

#define __parainstructions NULL

#define __stop_parainstructions NULL

#define __parainstructions_end NULL

#endif

#endif





#endif /* _X86_64_ALTERNATIVE_H */
 
#endif /* _X86_64_ALTERNATIVE_H */