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

Commit 8cd3c23d authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove empty giveup_altivec function on book3e CPUs 



Use an empty inline instead of an empty function to implement
giveup_altivec on book3e CPUs, similar to flush_altivec_to_thread.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 59c19cb2

arch/powerpc/include/asm/switch_to.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ extern void disable_kernel_fp(void); 
extern void enable_kernel_fp(void);

extern void enable_kernel_fp(void);

extern void flush_fp_to_thread(struct task_struct *);

extern void flush_fp_to_thread(struct task_struct *);

extern void enable_kernel_altivec(void);

extern void enable_kernel_altivec(void);

extern void giveup_altivec(struct task_struct *);

extern void load_up_altivec(struct task_struct *);

extern void load_up_altivec(struct task_struct *);

extern int emulate_altivec(struct pt_regs *);

extern int emulate_altivec(struct pt_regs *);

extern void __giveup_vsx(struct task_struct *);

extern void __giveup_vsx(struct task_struct *);
@@ -40,10 +39,14 @@ static inline void discard_lazy_cpu_state(void) 




#ifdef CONFIG_ALTIVEC

#ifdef CONFIG_ALTIVEC

extern void flush_altivec_to_thread(struct task_struct *);

extern void flush_altivec_to_thread(struct task_struct *);

extern void giveup_altivec(struct task_struct *);

#else

#else

static inline void flush_altivec_to_thread(struct task_struct *t)

static inline void flush_altivec_to_thread(struct task_struct *t)

{

{

}

}

static inline void giveup_altivec(struct task_struct *t)

{

}

#endif

#endif





#ifdef CONFIG_VSX

#ifdef CONFIG_VSX

arch/powerpc/kernel/head_44x.S

+0 −8
Original line number Original line Diff line number Diff line
@@ -777,14 +777,6 @@ _GLOBAL(__fixup_440A_mcheck) 
	sync

	sync

	blr

	blr





/*

 * extern void giveup_altivec(struct task_struct *prev)

 *

 * The 44x core does not have an AltiVec unit.

 */

_GLOBAL(giveup_altivec)

	blr



/*

/*

 * extern void giveup_fpu(struct task_struct *prev)

 * extern void giveup_fpu(struct task_struct *prev)

 *

 *

arch/powerpc/kernel/head_fsl_booke.S

+0 −8
Original line number Original line Diff line number Diff line
@@ -874,14 +874,6 @@ _GLOBAL(__setup_e500mc_ivors) 
	sync

	sync

	blr

	blr





/*

 * extern void giveup_altivec(struct task_struct *prev)

 *

 * The e500 core does not have an AltiVec unit.

 */

_GLOBAL(giveup_altivec)

	blr



#ifdef CONFIG_SPE

#ifdef CONFIG_SPE

/*

/*

 * extern void giveup_spe(struct task_struct *prev)

 * extern void giveup_spe(struct task_struct *prev)