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

Commit 5f20be44 authored by Kevin Hao's avatar Kevin Hao Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove the empty giveup_fpu() function on 32bit kernel 



Instead of implementing an empty giveup_fpu() function for each
32bit processor type, replace them with an unique empty inline
function.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 037f0eed

arch/powerpc/include/asm/switch_to.h

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ struct thread_struct; 
extern struct task_struct *_switch(struct thread_struct *prev,

				   struct thread_struct *next);



extern void giveup_fpu(struct task_struct *);

extern void load_up_fpu(void);

extern void enable_kernel_fp(void);

extern void enable_kernel_altivec(void);
@@ -38,8 +37,10 @@ static inline void discard_lazy_cpu_state(void) 


#ifdef CONFIG_PPC_FPU

extern void flush_fp_to_thread(struct task_struct *);

extern void giveup_fpu(struct task_struct *);

#else

static inline void flush_fp_to_thread(struct task_struct *t) { }

static inline void giveup_fpu(struct task_struct *t) { }

#endif



#ifdef CONFIG_ALTIVEC

arch/powerpc/kernel/head_40x.S

+0 −8
Original line number Diff line number Diff line
@@ -822,14 +822,6 @@ finish_tlb_load: 
	rfi			/* Should sync shadow TLBs */

	b	.		/* prevent prefetch past rfi */



/* extern void giveup_fpu(struct task_struct *prev)

 *

 * The PowerPC 4xx family of processors do not have an FPU, so this just

 * returns.

 */

_ENTRY(giveup_fpu)

	blr



/* This is where the main kernel code starts.

 */

start_here:

arch/powerpc/kernel/head_44x.S

+0 −10
Original line number Diff line number Diff line
@@ -784,16 +784,6 @@ _GLOBAL(__fixup_440A_mcheck) 
	sync

	blr



/*

 * extern void giveup_fpu(struct task_struct *prev)

 *

 * The 44x core does not have an FPU.

 */

#ifndef CONFIG_PPC_FPU

_GLOBAL(giveup_fpu)

	blr

#endif



_GLOBAL(set_context)



#ifdef CONFIG_BDI_SWITCH

arch/powerpc/kernel/head_8xx.S

+0 −4
Original line number Diff line number Diff line
@@ -691,10 +691,6 @@ modified_instr: 
	b	151b

#endif



	.globl	giveup_fpu

giveup_fpu:

	blr



/*

 * This is where the main kernel code starts.

 */

arch/powerpc/kernel/head_fsl_booke.S

+0 −10
Original line number Diff line number Diff line
@@ -947,16 +947,6 @@ _GLOBAL(giveup_spe) 
	blr

#endif /* CONFIG_SPE */



/*

 * extern void giveup_fpu(struct task_struct *prev)

 *

 * Not all FSL Book-E cores have an FPU

 */

#ifndef CONFIG_PPC_FPU

_GLOBAL(giveup_fpu)

	blr

#endif



/*

 * extern void abort(void)

 *