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

Commit 5ce6386b 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: (24 commits)
  [POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages
  [POWERPC] Allow for different IOMMU page sizes in cell IOMMU code
  [POWERPC] Cell IOMMU: n_pte_pages is in 4K page units, not IOMMU_PAGE_SIZE
  [POWERPC] Split setup of IOMMU stab and ptab, allocate dynamic/fixed ptabs separately
  [POWERPC] Move allocation of cell IOMMU pad page
  [POWERPC] Remove unused pte_offset variable
  [POWERPC] Use it_offset not pte_offset in cell IOMMU code
  [POWERPC] Clearup cell IOMMU fixed mapping terminology
  [POWERPC] enable hardware watchpoints on cell blades
  [POWERPC] move celleb DABRX definitions
  [POWERPC] OProfile: enable callgraph support for Cell
  [POWERPC] spufs: fix use time accounting on SPE-overcommit
  [POWERPC] spufs: serialize SLB invalidation against SLB loading
  [POWERPC] spufs: invalidate SLB translation before adding a new entry
  [POWERPC] spufs: synchronize IRQ when disabling
  [POWERPC] spufs: fix order of sputrace thread IDs
  [POWERPC] Xilinx: hwicap cleanup
  [POWERPC] 4xx: Use correct board info structure in cuboot wrappers
  [POWERPC] spufs: fix invalid scheduling of forgotten contexts
  [POWERPC] 44x: add missing define TARGET_4xx and TARGET_440GX to cuboot-taishan
  ...
parents a64e715f 3cecdda3

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;

arch/powerpc/boot/cuboot-warp.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "4xx.h"

#include "cuboot.h"



#define TARGET_4xx

#define TARGET_44x

#include "ppcboot.h"