Commit c53ab5d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix powermac late initcall to only run on powermac
  [POWERPC] PowerPC: Prevent data exception in kernel space (32-bit)
parents 8acff0a2 c5f226c7

arch/powerpc/mm/fault.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -279,14 +279,13 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, 
#endif /* CONFIG_8xx */

#endif /* CONFIG_8xx */





	if (is_exec) {

	if (is_exec) {

#ifdef CONFIG_PPC64

#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))

		/* protection fault */

		/* protection fault */

		if (error_code & DSISR_PROTFAULT)

		if (error_code & DSISR_PROTFAULT)

			goto bad_area;

			goto bad_area;

		if (!(vma->vm_flags & VM_EXEC))

		if (!(vma->vm_flags & VM_EXEC))

			goto bad_area;

			goto bad_area;

#endif

#else

#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)

		pte_t *ptep;

		pte_t *ptep;

		pmd_t *pmdp;

		pmd_t *pmdp;

arch/powerpc/platforms/powermac/setup.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -454,6 +454,9 @@ static int initializing = 1; 




static int pmac_late_init(void)

static int pmac_late_init(void)

{

{

	if (!machine_is(powermac))

		return -ENODEV;



	initializing = 0;

	initializing = 0;

	/* this is udbg (which is __init) and we can later use it during

	/* this is udbg (which is __init) and we can later use it during

	 * cpu hotplug (in smp_core99_kick_cpu) */

	 * cpu hotplug (in smp_core99_kick_cpu) */