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

Commit 18447502 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
  drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
  powerpc/85xx: fix mpic configuration in CAMP mode
  powerpc: Copy back TIF flags on return from softirq stack
  powerpc/64: Make server perfmon only built on ppc64 server devices
  powerpc/pseries: Fix hvc_vio.c build due to recent changes
  powerpc: Exporting boot_cpuid_phys
  powerpc: Add CFAR to oops output
  hvc_console: Add kdb support
  powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
  powerpc/irq: Quieten irq mapping printks
  powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
  powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
  powerpc: Disable IRQs off tracer in ppc64 defconfig
  powerpc: Sync pseries and ppc64 defconfigs
  powerpc/pseries/hvconsole: Fix dropped console output
  hvc_console: Improve tty/console put_chars handling
  powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
  powerpc/mm: Fix output of total_ram.
  powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
  powerpc: Correct annotations of pmu registration functions
  ...

Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
drivers/cpufreq
parents 3b76eefe f1f4ee01

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ Code Seq#(hex) Include File Comments 
					<mailto:rusty@rustcorp.com.au>

0xAE	all	linux/kvm.h		Kernel-based Virtual Machine

					<mailto:kvm@vger.kernel.org>

0xAF	00-1F	linux/fsl_hypervisor.h	Freescale hypervisor

0xB0	all	RATIO devices		in development:

					<mailto:vgo@ratio.de>

0xB1	00-1F	PPPoX			<mailto:mostrows@styx.uwaterloo.ca>

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -2526,6 +2526,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			<port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>

			See also Documentation/input/joystick-parport.txt



	udbg-immortal	[PPC] When debugging early kernel crashes that

			happen after console_init() and before a proper 

			console driver takes over, this boot options might

			help "seeing" what's going on.



	uhash_entries=	[KNL,NET]

			Set number of hash buckets for UDP/UDP-Lite connections

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3895,7 +3895,7 @@ F: arch/powerpc/platforms/512x/ 
F:	arch/powerpc/platforms/52xx/



LINUX FOR POWERPC EMBEDDED PPC4XX

M:	Josh Boyer <jwboyer@linux.vnet.ibm.com>

M:	Josh Boyer <jwboyer@gmail.com>

M:	Matt Porter <mporter@kernel.crashing.org>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org
@@ -3927,6 +3927,7 @@ W: http://www.penguinppc.org/ 
L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

F:	arch/powerpc/platforms/83xx/

F:	arch/powerpc/platforms/85xx/



LINUX FOR POWERPC PA SEMI PWRFICIENT

M:	Olof Johansson <olof@lixom.net>

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ config PPC 
	select HAVE_RCU_TABLE_FREE if SMP

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_BPF_JIT if (PPC64 && NET)

	select HAVE_ARCH_JUMP_LABEL



config EARLY_PRINTK

	bool
@@ -842,7 +843,7 @@ config LOWMEM_CAM_NUM 


config RELOCATABLE

	bool "Build a relocatable kernel (EXPERIMENTAL)"

	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE

	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || PPC_47x)

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at (some alignment restrictions may

arch/powerpc/Kconfig.debug

+15 −0
Original line number Diff line number Diff line
@@ -167,6 +167,13 @@ config PPC_EARLY_DEBUG_LPAR 
	  Select this to enable early debugging for a machine with a HVC

	  console on vterm 0.



config PPC_EARLY_DEBUG_LPAR_HVSI

	bool "LPAR HVSI Console"

	depends on PPC_PSERIES

	help

	  Select this to enable early debugging for a machine with a HVSI

	  console on a specified vterm.



config PPC_EARLY_DEBUG_G5

	bool "Apple G5"

	depends on PPC_PMAC64
@@ -253,6 +260,14 @@ config PPC_EARLY_DEBUG_WSP 


endchoice



config PPC_EARLY_DEBUG_HVSI_VTERMNO

	hex "vterm number to use with early debug HVSI"

	depends on PPC_EARLY_DEBUG_LPAR_HVSI

	default "0x30000000"

	help

	  You probably want 0x30000000 for your first serial port and

	  0x30000001 for your second one



config PPC_EARLY_DEBUG_44x_PHYSLOW

	hex "Low 32 bits of early debug UART physical address"

	depends on PPC_EARLY_DEBUG_44x