Commit 8af03e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...
parents 62326650 99e13912

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/isdn/README.HiSax.



	hugepages=	[HW,X86-32,IA-64] Maximal number of HugeTLB pages.

	hugepagesz=	[HW,IA-64,PPC] The size of the HugeTLB pages.



	i8042.direct	[HW] Put keyboard port into non-translated mode

	i8042.dumbkbd	[HW] Pretend that controller can only read data from

Documentation/powerpc/00-INDEX

+3 −0
Original line number Diff line number Diff line
@@ -28,3 +28,6 @@ sound.txt 
	- info on sound support under Linux/PPC

zImage_layout.txt

	- info on the kernel images for Linux/PPC

qe_firmware.txt

	- describes the layout of firmware binaries for the Freescale QUICC

	  Engine and the code that parses and uploads the microcode therein.

Documentation/powerpc/booting-without-of.txt

+314 −53

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/powerpc/qe_firmware.txt

0 → 100644
+295 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/Kconfig

+15 −2
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ config DEFAULT_UIMAGE 
	  Used to allow a board to specify it wants a uImage built by default

	default n



config REDBOOT

	bool



config PPC64_SWSUSP

	bool

	depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
@@ -168,11 +171,13 @@ config PPC_DCR 


config PPC_OF_PLATFORM_PCI

	bool

	depends on PCI

	depends on PPC64 # not supported on 32 bits yet

	default n



source "init/Kconfig"



source "arch/powerpc/sysdev/Kconfig"

source "arch/powerpc/platforms/Kconfig"



menu "Kernel options"
@@ -348,6 +353,14 @@ config PPC_64K_PAGES 
	  while on hardware with such support, it will be used to map

	  normal application pages.



config PPC_SUBPAGE_PROT

	bool "Support setting protections for 4k subpages"

	depends on PPC_64K_PAGES

	help

	  This option adds support for a system call to allow user programs

	  to set access permissions (read/write, readonly, or no access)

	  on the 4k subpages of each 64k page.



config SCHED_SMT

	bool "SMT (Hyperthreading) scheduler support"

	depends on PPC64 && SMP
@@ -425,7 +438,7 @@ endmenu 


config ISA_DMA_API

	bool

	default y

	default !PPC_ISERIES || PCI



menu "Bus options"
@@ -475,7 +488,7 @@ config MCA 
config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \

		|| PPC_PS3

		|| PPC_PS3 || 44x

	default y if !40x && !CPM2 && !8xx && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

CRA Git | Maintained and supported by SUSTech CRA and CCSE