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

Commit 966ea8c4 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 41c5ae68 976dde01

arch/arm/mm/pgd.c

+2 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) 
void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)

{

	pmd_t *pmd;

	struct page *pte;

	pgtable_t pte;



	if (!pgd)

		return;
@@ -90,10 +90,8 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) 
		goto free;

	}



	pte = pmd_page(*pmd);

	pte = pmd_pgtable(*pmd);

	pmd_clear(pmd);

	dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);

	pte_lock_deinit(pte);

	pte_free(mm, pte);

	pmd_free(mm, pmd);

free:

arch/powerpc/boot/cuboot-bamboo.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-ebony.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-katmai.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "44x.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"

arch/powerpc/boot/cuboot-taishan.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
#include "dcr.h"

#include "4xx.h"



#define TARGET_4xx

#define TARGET_44x

#define TARGET_440GX

#include "ppcboot.h"



static bd_t bd;