Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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)
This commit is contained in:
Linus Torvalds 2007-06-20 14:28:54 -07:00
commit c53ab5d56c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/mm/fault.c
View File

@ -279,14 +279,13 @@ good_area:
#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;

3
arch/powerpc/platforms/powermac/setup.c
View File

@ -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) */