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

Commit 76babde1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
  [PATCH] powerpc: Remove oprofile spinlock backtrace code
  [PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
  [PATCH] powerpc: Add oprofile calltrace support
  [PATCH] for_each_possible_cpu: ppc
  [PATCH] for_each_possible_cpu: powerpc
  [PATCH] lock PTE before updating it in 440/BookE page fault handler
  [PATCH] powerpc: Kill _machine and hard-coded platform numbers
  ppc: Fix compile error in arch/ppc/lib/strcase.c
  [PATCH] git-powerpc: WARN was a dumb idea
  [PATCH] powerpc: a couple of trivial compile warning fixes
  powerpc: remove OCP references
  powerpc: Make uImage default build output for MPC8540 ADS
  powerpc: move math-emu over to arch/powerpc
  powerpc: use memparse() for mem= command line parsing
  ppc: fix strncasecmp prototype
  [PATCH] powerpc: make ISA floppies work again
  [PATCH] powerpc: Fix some initcall return values
  [PATCH] powerpc: Workaround for pSeries RTAS bug
  [PATCH] spufs: fix __init/__exit annotations
  [PATCH] powerpc: add hvc backend for rtas
  ...
parents e71ac603 15e812ad

Documentation/powerpc/booting-without-of.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -719,6 +719,11 @@ address which can extend beyond that limit. 
    - model : this is your board name/model

    - model : this is your board name/model

    - #address-cells : address representation for "root" devices

    - #address-cells : address representation for "root" devices

    - #size-cells: the size representation for "root" devices

    - #size-cells: the size representation for "root" devices

    - device_type : This property shouldn't be necessary. However, if

      you decide to create a device_type for your root node, make sure it

      is _not_ "chrp" unless your platform is a pSeries or PAPR compliant

      one for 64-bit, or a CHRP-type machine for 32-bit as this will

      matched by the kernel this way.





  Additionally, some recommended properties are:

  Additionally, some recommended properties are:

arch/powerpc/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -491,7 +491,7 @@ config PPC601_SYNC_FIX 
	  If in doubt, say Y here.

	  If in doubt, say Y here.





config TAU

config TAU

	bool "Thermal Management Support"

	bool "On-chip CPU temperature sensor support"

	depends on 6xx

	depends on 6xx

	help

	help

	  G3 and G4 processors have an on-chip temperature sensor called the

	  G3 and G4 processors have an on-chip temperature sensor called the
@@ -500,7 +500,7 @@ config TAU 
	  on-die temperature in /proc/cpuinfo if the cpu supports it.

	  on-die temperature in /proc/cpuinfo if the cpu supports it.





	  Unfortunately, on some chip revisions, this sensor is very inaccurate

	  Unfortunately, on some chip revisions, this sensor is very inaccurate

	  and in some cases, does not work at all, so don't assume the cpu

	  and in many cases, does not work at all, so don't assume the cpu

	  temp is actually what /proc/cpuinfo says it is.

	  temp is actually what /proc/cpuinfo says it is.





config TAU_INT

config TAU_INT

arch/powerpc/Kconfig.debug

+0 −5
Original line number Original line Diff line number Diff line
@@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG 
	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \

	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \

		PPC_GEN550 || PPC_MPC52xx

		PPC_GEN550 || PPC_MPC52xx





config PPC_OCP

	bool

	depends on IBM_OCP || XILINX_OCP

	default y



choice

choice

	prompt "Early debugging (dangerous)"

	prompt "Early debugging (dangerous)"

	bool

	bool

arch/powerpc/Makefile

+1 −6
Original line number Original line Diff line number Diff line
@@ -129,13 +129,8 @@ core-y += arch/powerpc/kernel/ \ 
				   arch/powerpc/lib/ \

				   arch/powerpc/lib/ \

				   arch/powerpc/sysdev/ \

				   arch/powerpc/sysdev/ \

				   arch/powerpc/platforms/

				   arch/powerpc/platforms/

core-$(CONFIG_PPC32)		+= arch/ppc/kernel/

core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/

core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/

core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

core-$(CONFIG_APUS)		+= arch/ppc/amiga/

drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/

drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/

drivers-$(CONFIG_CPM2)		+= arch/ppc/8260_io/





drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/

drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/

arch/powerpc/configs/cell_defconfig

+52 −81
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc6

# Linux kernel version: 2.6.16

# Wed Mar 15 16:19:48 2006

# Thu Mar 23 20:48:09 2006

#

#

CONFIG_PPC64=y

CONFIG_PPC64=y

CONFIG_64BIT=y

CONFIG_64BIT=y
@@ -30,6 +30,7 @@ CONFIG_POWER4=y 
CONFIG_PPC_FPU=y

CONFIG_PPC_FPU=y

CONFIG_ALTIVEC=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_NR_CPUS=4
@@ -51,7 +52,8 @@ CONFIG_SYSVIPC=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

# CONFIG_CPUSETS is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -85,7 +87,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_OBSOLETE_MODPARM=y

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_KMOD is not set

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_STOP_MACHINE=y





#

#
@@ -130,7 +132,8 @@ CONFIG_CELL_IIC=y 
#

#

# Cell Broadband Engine options

# Cell Broadband Engine options

#

#

CONFIG_SPU_FS=y

CONFIG_SPU_FS=m

CONFIG_SPUFS_MMAP=y





#

#

# Kernel options

# Kernel options
@@ -144,7 +147,7 @@ CONFIG_PREEMPT_NONE=y 
# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

CONFIG_PREEMPT_BKL=y

CONFIG_PREEMPT_BKL=y

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_BINFMT_MISC=m

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_FORCE_MAX_ZONEORDER=13

# CONFIG_IOMMU_VMERGE is not set

# CONFIG_IOMMU_VMERGE is not set

CONFIG_KEXEC=y

CONFIG_KEXEC=y
@@ -155,13 +158,16 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y 
CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_FLATMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_FLATMEM=y

CONFIG_SPARSEMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

# CONFIG_MEMORY_HOTPLUG is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

CONFIG_SCHED_SMT=y

CONFIG_SCHED_SMT=y

CONFIG_PROC_DEVICETREE=y

CONFIG_PROC_DEVICETREE=y
@@ -232,6 +238,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IP_VS is not set

# CONFIG_IP_VS is not set

CONFIG_IPV6=y

CONFIG_IPV6=y

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_IPV6_ROUTER_PREF is not set

CONFIG_INET6_AH=m

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_INET6_IPCOMP=m
@@ -244,25 +251,7 @@ CONFIG_NETFILTER=y 
# Core Netfilter Configuration

# Core Netfilter Configuration

#

#

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_NETFILTER_NETLINK is not set

CONFIG_NETFILTER_XTABLES=m

# CONFIG_NETFILTER_XTABLES is not set

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

CONFIG_NETFILTER_XT_TARGET_NOTRACK=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

# CONFIG_NETFILTER_XT_MATCH_DCCP is not set

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m

CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_SCTP=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m





#

#

# IP: Netfilter Configuration

# IP: Netfilter Configuration
@@ -278,51 +267,13 @@ CONFIG_IP_NF_IRC=m 
CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_TFTP=m

CONFIG_IP_NF_AMANDA=m

CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_IPRANGE=m

CONFIG_IP_NF_MATCH_MULTIPORT=m

CONFIG_IP_NF_MATCH_TOS=m

CONFIG_IP_NF_MATCH_RECENT=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_DSCP=m

CONFIG_IP_NF_MATCH_AH_ESP=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_MATCH_OWNER=m

CONFIG_IP_NF_MATCH_ADDRTYPE=m

CONFIG_IP_NF_MATCH_HASHLIMIT=m

CONFIG_IP_NF_MATCH_POLICY=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_IP_NF_TARGET_TCPMSS=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_NAT_NEEDED=y

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_SAME=m

CONFIG_IP_NF_NAT_SNMP_BASIC=m

CONFIG_IP_NF_NAT_IRC=m

CONFIG_IP_NF_NAT_FTP=m

CONFIG_IP_NF_NAT_TFTP=m

CONFIG_IP_NF_NAT_AMANDA=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_TOS=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_DSCP=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m





#

#

# IPv6: Netfilter Configuration (EXPERIMENTAL)

# IPv6: Netfilter Configuration (EXPERIMENTAL)

#

#

# CONFIG_IP6_NF_QUEUE is not set

# CONFIG_IP6_NF_QUEUE is not set

# CONFIG_IP6_NF_IPTABLES is not set





#

#

# DCCP Configuration (EXPERIMENTAL)

# DCCP Configuration (EXPERIMENTAL)
@@ -355,7 +306,6 @@ CONFIG_IP_NF_ARP_MANGLE=m 
# QoS and/or fair queueing

# QoS and/or fair queueing

#

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y





#

#

# Network testing

# Network testing
@@ -408,7 +358,7 @@ CONFIG_FW_LOADER=y 
# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP=y

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

CONFIG_BLK_DEV_NBD=y

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_SX8 is not set

# CONFIG_BLK_DEV_SX8 is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_COUNT=16
@@ -484,7 +434,23 @@ CONFIG_IDEDMA_AUTO=y 
#

#

# Multi-device support (RAID and LVM)

# Multi-device support (RAID and LVM)

#

#

# CONFIG_MD is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

# CONFIG_MD_RAID10 is not set

# CONFIG_MD_RAID5 is not set

# CONFIG_MD_RAID6 is not set

# CONFIG_MD_MULTIPATH is not set

# CONFIG_MD_FAULTY is not set

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

# CONFIG_DM_MULTIPATH_EMC is not set





#

#

# Fusion MPT device support

# Fusion MPT device support
@@ -548,7 +514,7 @@ CONFIG_MII=y 
# CONFIG_ACENIC is not set

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

# CONFIG_DL2K is not set

CONFIG_E1000=m

CONFIG_E1000=m

# CONFIG_E1000_NAPI is not set

CONFIG_E1000_NAPI=y

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_NS83820 is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_HAMACHI is not set
@@ -560,7 +526,7 @@ CONFIG_SKGE=m 
# CONFIG_SK98LIN is not set

# CONFIG_SK98LIN is not set

# CONFIG_TIGON3 is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

# CONFIG_BNX2 is not set

CONFIG_SPIDER_NET=y

CONFIG_SPIDER_NET=m

# CONFIG_MV643XX_ETH is not set

# CONFIG_MV643XX_ETH is not set





#

#
@@ -678,6 +644,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_HVC_DRIVER=y

CONFIG_HVC_RTAS=y





#

#

# IPMI

# IPMI
@@ -694,14 +662,13 @@ CONFIG_WATCHDOG=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_WATCHDOG_RTAS is not set

CONFIG_WATCHDOG_RTAS=y





#

#

# PCI-based Watchdog Cards

# PCI-based Watchdog Cards

#

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set

# CONFIG_WDTPCI is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set

# CONFIG_DTLK is not set
@@ -833,6 +800,7 @@ CONFIG_DUMMY_CONSOLE=y 
#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

# CONFIG_USB is not set

# CONFIG_USB is not set





#

#
@@ -852,7 +820,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

#

# InfiniBand support

# InfiniBand support

#

#

# CONFIG_INFINIBAND is not set

CONFIG_INFINIBAND=y

CONFIG_INFINIBAND_USER_MAD=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_INFINIBAND_MTHCA=m

CONFIG_INFINIBAND_MTHCA_DEBUG=y

CONFIG_INFINIBAND_IPOIB=m

CONFIG_INFINIBAND_IPOIB_DEBUG=y

CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y





#

#

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -1037,10 +1012,6 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=m

CONFIG_ZLIB_INFLATE=m

CONFIG_ZLIB_DEFLATE=m

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m





#

#

# Instrumentation Support

# Instrumentation Support
@@ -1058,7 +1029,7 @@ CONFIG_LOG_BUF_SHIFT=15 
CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_MUTEXES is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_KOBJECT is not set