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

Commit 973c1fab authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

parents 4383162c d10f7348

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ config FORCE_MAX_ZONEORDER 


config MATH_EMULATION

	bool "Math emulation"

	depends on 4xx || 8xx || E200 || E500

	depends on 4xx || 8xx || E200 || PPC_83xx || E500

	---help---

	  Some PowerPC chips designed for embedded applications do not have

	  a floating-point unit and therefore do not implement the

arch/powerpc/kernel/cputable.c

+2 −3
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static struct cpu_spec cpu_specs[] = { 
		.pvr_mask		= 0x7fff0000,

		.pvr_value		= 0x00840000,

		.cpu_name		= "e300c2",

		.cpu_features		= CPU_FTRS_E300,

		.cpu_features		= CPU_FTRS_E300C2,

		.cpu_user_features	= PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,
@@ -1136,8 +1136,7 @@ static struct cpu_spec cpu_specs[] = { 
		.pvr_mask		= 0xff000fff,

		.pvr_value		= 0x53000890,

		.cpu_name		= "440SPe Rev. A",

		.cpu_features		= CPU_FTR_SPLIT_ID_CACHE |

			CPU_FTR_USE_TB,

		.cpu_features		= CPU_FTRS_44X,

		.cpu_user_features	= COMMON_USER_BOOKE,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

arch/powerpc/kernel/head_32.S

+7 −0
Original line number Diff line number Diff line
@@ -437,6 +437,13 @@ Alignment: 
/* Floating-point unavailable */

	. = 0x800

FPUnavailable:

BEGIN_FTR_SECTION

/*

 * Certain Freescale cores don't have a FPU and treat fp instructions

 * as a FP Unavailable exception.  Redirect to illegal/emulation handling.

 */

	b 	ProgramCheck

END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE)

	EXCEPTION_PROLOG

	bne	load_up_fpu		/* if from user, just load it up */

	addi	r3,r1,STACK_FRAME_OVERHEAD

arch/powerpc/kernel/of_device.c

+1 −3
Original line number Diff line number Diff line
@@ -109,9 +109,7 @@ int of_device_register(struct of_device *ofdev) 
	if (rc)

		return rc;



	device_create_file(&ofdev->dev, &dev_attr_devspec);



	return 0;

	return device_create_file(&ofdev->dev, &dev_attr_devspec);

}



void of_device_unregister(struct of_device *ofdev)

arch/powerpc/kernel/ppc_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ 
extern long *intercept_table;

EXPORT_SYMBOL(intercept_table);

#endif /* CONFIG_PPC_STD_MMU_32 */

#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)

#ifdef CONFIG_PPC_DCR_NATIVE

EXPORT_SYMBOL(__mtdcr);

EXPORT_SYMBOL(__mfdcr);

#endif