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

Commit 49b1e3ea 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:
  [POWERPC] Minor comment fix for misc_64.S
  [POWERPC] Use H_CEDE on non-SMT
  [POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs
  [POWERPC] PMAC_APM_EMU should depend on ADB_PMU
  [POWERPC] Fix new interrupt code (MPIC detection)
  [POWERPC] Fix new interrupt code (MPIC endianness)
  [POWERPC] Add cpufreq support for Xserve G5
  [POWERPC] Xserve G5 thermal control fixes
  [POWERPC] Fix mem= handling when the memory limit is > RMO size
  [POWERPC] More offb/bootx fixes
  [POWERPC] Fix legacy_serial.c error handling on 32 bits
  [POWERPC] Fix default clock for udbg_16550
  [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set
  [POWERPC] Fix 32 bits warning in prom_init.c
  [POWERPC] Workaround Pegasos incorrect ISA "ranges"
  [POWERPC] fix up front-LED Kconfig
parents ce38cac4 8d950cb8

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ config CPU_FREQ_PMAC 


config CPU_FREQ_PMAC64

	bool "Support for some Apple G5s"

	depends on CPU_FREQ && PMAC_SMU && PPC64

	depends on CPU_FREQ && PPC64

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple iMac G5,

arch/powerpc/configs/pmac32_defconfig

+96 −16
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc5

# Mon May 29 14:47:49 2006

# Linux kernel version: 2.6.17

# Mon Jul  3 14:20:49 2006

#

# CONFIG_PPC64 is not set

CONFIG_PPC32=y

CONFIG_PPC_MERGE=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y

CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_CLASSIC32=y 
# CONFIG_PPC_82xx is not set

# CONFIG_PPC_83xx is not set

# CONFIG_PPC_85xx is not set

# CONFIG_PPC_86xx is not set

# CONFIG_40x is not set

# CONFIG_44x is not set

# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_ALTIVEC=y 
CONFIG_PPC_STD_MMU=y

CONFIG_PPC_STD_MMU_32=y

# CONFIG_SMP is not set

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -72,10 +76,12 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -119,6 +125,9 @@ CONFIG_PPC_MULTIPLATFORM=y 
# CONFIG_APUS is not set

# CONFIG_PPC_CHRP is not set

CONFIG_PPC_PMAC=y

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_UDBG_RTAS_CONSOLE is not set

CONFIG_MPIC=y

# CONFIG_PPC_RTAS is not set

# CONFIG_MMIO_NVRAM is not set
@@ -154,6 +163,7 @@ CONFIG_PREEMPT_NONE=y 
# CONFIG_PREEMPT is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

# CONFIG_KEXEC is not set

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -164,6 +174,7 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

CONFIG_PM=y
@@ -182,6 +193,7 @@ CONFIG_GENERIC_ISA_DMA=y 
CONFIG_PPC_INDIRECT_PCI=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_DEBUG is not set



#
@@ -256,6 +268,8 @@ CONFIG_INET_ESP=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -268,6 +282,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set
@@ -292,9 +307,11 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m 
CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_SCTP=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -313,6 +330,7 @@ CONFIG_IP_NF_TFTP=m 
CONFIG_IP_NF_AMANDA=m

CONFIG_IP_NF_PPTP=m

CONFIG_IP_NF_H323=m

# CONFIG_IP_NF_SIP is not set

# CONFIG_IP_NF_QUEUE is not set

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -457,6 +475,7 @@ CONFIG_IRTTY_SIR=m 
# CONFIG_ALI_FIR is not set

# CONFIG_VLSI_FIR is not set

# CONFIG_VIA_FIR is not set

# CONFIG_MCS_FIR is not set

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m
@@ -500,6 +519,7 @@ CONFIG_WIRELESS_EXT=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -600,7 +620,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y 
CONFIG_BLK_DEV_IDE_PMAC=y

CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y

CONFIG_BLK_DEV_IDEDMA_PMAC=y

CONFIG_BLK_DEV_IDE_PMAC_BLINK=y

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set
@@ -661,6 +680,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m 
# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set
@@ -705,9 +725,7 @@ CONFIG_MD_LINEAR=m 
CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=m

CONFIG_MD_RAID5_RESHAPE=y

CONFIG_MD_RAID6=m

# CONFIG_MD_RAID456 is not set

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=m
@@ -750,7 +768,6 @@ CONFIG_IEEE1394_OHCI1394=m 
#

CONFIG_IEEE1394_VIDEO1394=m

CONFIG_IEEE1394_SBP2=m

# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set

# CONFIG_IEEE1394_ETH1394 is not set

CONFIG_IEEE1394_DV1394=m

CONFIG_IEEE1394_RAWIO=m
@@ -766,9 +783,12 @@ CONFIG_IEEE1394_RAWIO=m 
CONFIG_ADB=y

CONFIG_ADB_CUDA=y

CONFIG_ADB_PMU=y

CONFIG_ADB_PMU_LED=y

CONFIG_ADB_PMU_LED_IDE=y

CONFIG_PMAC_APM_EMU=m

CONFIG_PMAC_MEDIABAY=y

CONFIG_PMAC_BACKLIGHT=y

CONFIG_PMAC_BACKLIGHT_LEGACY=y

CONFIG_INPUT_ADBHID=y

CONFIG_MAC_EMUMOUSEBTN=y

CONFIG_THERM_WINDTUNNEL=m
@@ -858,6 +878,7 @@ CONFIG_PCNET32=y 
# CONFIG_CHELSIO_T1 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set



#

# Token Ring devices
@@ -908,6 +929,7 @@ CONFIG_APPLE_AIRPORT=m 
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support

#

CONFIG_PRISM54=m

# CONFIG_USB_ZD1201 is not set

# CONFIG_HOSTAP is not set

CONFIG_NET_WIRELESS=y
@@ -998,6 +1020,7 @@ CONFIG_SERIO=y 
CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_SERIAL_NONSTANDARD is not set



#
@@ -1029,6 +1052,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

CONFIG_NVRAM=y

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set
@@ -1040,6 +1064,7 @@ CONFIG_GEN_RTC=y 
# Ftape, the floppy tape device driver

#

CONFIG_AGP=m

# CONFIG_AGP_SIS is not set

# CONFIG_AGP_VIA is not set

CONFIG_AGP_UNINORTH=m

CONFIG_DRM=m
@@ -1092,6 +1117,7 @@ CONFIG_I2C_ALGOBIT=y 
CONFIG_I2C_POWERMAC=y

# CONFIG_I2C_MPC is not set

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set
@@ -1156,12 +1182,13 @@ CONFIG_VIDEO_V4L2=y 
#

# Graphics support

#

# CONFIG_FIRMWARE_EDID is not set

CONFIG_FB=y

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_MACMODES=y

CONFIG_FB_FIRMWARE_EDID=y

CONFIG_FB_BACKLIGHT=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set
@@ -1178,6 +1205,7 @@ CONFIG_FB_IMSTT=y 
# CONFIG_FB_S1D13XXX is not set

CONFIG_FB_NVIDIA=y

CONFIG_FB_NVIDIA_I2C=y

CONFIG_FB_NVIDIA_BACKLIGHT=y

# CONFIG_FB_RIVA is not set

CONFIG_FB_MATROX=y

CONFIG_FB_MATROX_MILLENIUM=y
@@ -1187,12 +1215,15 @@ CONFIG_FB_MATROX_MYSTIQUE=y 
# CONFIG_FB_MATROX_MULTIHEAD is not set

CONFIG_FB_RADEON=y

CONFIG_FB_RADEON_I2C=y

CONFIG_FB_RADEON_BACKLIGHT=y

# CONFIG_FB_RADEON_DEBUG is not set

CONFIG_FB_ATY128=y

CONFIG_FB_ATY128_BACKLIGHT=y

CONFIG_FB_ATY=y

CONFIG_FB_ATY_CT=y

# CONFIG_FB_ATY_GENERIC_LCD is not set

CONFIG_FB_ATY_GX=y

CONFIG_FB_ATY_BACKLIGHT=y

# CONFIG_FB_SAVAGE is not set

# CONFIG_FB_SIS is not set

# CONFIG_FB_NEOMAGIC is not set
@@ -1221,7 +1252,11 @@ CONFIG_LOGO=y 
CONFIG_LOGO_LINUX_MONO=y

CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_DEVICE=y

CONFIG_LCD_CLASS_DEVICE=m

CONFIG_LCD_DEVICE=y



#

# Sound
@@ -1278,6 +1313,18 @@ CONFIG_SND_DUMMY=m 
# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_DARLA20 is not set

# CONFIG_SND_GINA20 is not set

# CONFIG_SND_LAYLA20 is not set

# CONFIG_SND_DARLA24 is not set

# CONFIG_SND_GINA24 is not set

# CONFIG_SND_LAYLA24 is not set

# CONFIG_SND_MONA is not set

# CONFIG_SND_MIA is not set

# CONFIG_SND_ECHO3G is not set

# CONFIG_SND_INDIGO is not set

# CONFIG_SND_INDIGOIO is not set

# CONFIG_SND_INDIGODJ is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_ENS1370 is not set
@@ -1314,6 +1361,17 @@ CONFIG_SND_DUMMY=m 
CONFIG_SND_POWERMAC=m

CONFIG_SND_POWERMAC_AUTO_DRC=y



#

# Apple Onboard Audio driver

#

CONFIG_SND_AOA=m

CONFIG_SND_AOA_FABRIC_LAYOUT=m

CONFIG_SND_AOA_ONYX=m

CONFIG_SND_AOA_TAS=m

CONFIG_SND_AOA_TOONIE=m

CONFIG_SND_AOA_SOUNDBUS=m

CONFIG_SND_AOA_SOUNDBUS_I2S=m



#

# USB devices

#
@@ -1355,6 +1413,7 @@ CONFIG_USB_DYNAMIC_MINORS=y 
CONFIG_USB_EHCI_HCD=m

CONFIG_USB_EHCI_SPLIT_ISO=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1431,7 +1490,6 @@ CONFIG_USB_NET_NET1080=m 
# CONFIG_USB_NET_RNDIS_HOST is not set

# CONFIG_USB_NET_CDC_SUBSET is not set

CONFIG_USB_NET_ZAURUS=m

# CONFIG_USB_ZD1201 is not set

CONFIG_USB_MON=y



#
@@ -1499,10 +1557,12 @@ CONFIG_USB_EZUSB=y 
# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

CONFIG_USB_APPLEDISPLAY=m

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TEST is not set
@@ -1524,7 +1584,8 @@ CONFIG_USB_EZUSB=y 
#

# LED devices

#

# CONFIG_NEW_LEDS is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y



#

# LED drivers
@@ -1533,6 +1594,10 @@ CONFIG_USB_EZUSB=y 
#

# LED Triggers

#

CONFIG_LEDS_TRIGGERS=y

# CONFIG_LEDS_TRIGGER_TIMER is not set

CONFIG_LEDS_TRIGGER_IDE_DISK=y

# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set



#

# InfiniBand support
@@ -1548,6 +1613,19 @@ CONFIG_USB_EZUSB=y 
#

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# File systems

#
@@ -1569,6 +1647,7 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -1649,6 +1728,7 @@ CONFIG_RPCSEC_GSS_KRB5=y 
CONFIG_SMB_FS=m

# CONFIG_SMB_NLS_DEFAULT is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -1732,6 +1812,7 @@ CONFIG_TEXTSEARCH=y 
CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m

CONFIG_PLIST=y



#

# Instrumentation Support
@@ -1744,12 +1825,15 @@ CONFIG_OPROFILE=y 
#

# CONFIG_PRINTK_TIME is not set

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set
@@ -1763,11 +1847,7 @@ CONFIG_XMON=y 
CONFIG_XMON_DEFAULT=y

# CONFIG_BDI_SWITCH is not set

CONFIG_BOOTX_TEXT=y

# CONFIG_PPC_EARLY_DEBUG_LPAR is not set

# CONFIG_PPC_EARLY_DEBUG_G5 is not set

# CONFIG_PPC_EARLY_DEBUG_RTAS is not set

# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set

# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set

# CONFIG_PPC_EARLY_DEBUG is not set



#

# Security options

arch/powerpc/kernel/head_64.S

+33 −2
Original line number Diff line number Diff line
@@ -191,6 +191,37 @@ exception_marker: 
	ori	reg,reg,(label)@l;	/* virt addr of handler ... */

#endif



/*

 * Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.

 * The firmware calls the registered system_reset_fwnmi and

 * machine_check_fwnmi handlers in 32bit mode if the cpu happens to run

 * a 32bit application at the time of the event.

 * This firmware bug is present on POWER4 and JS20.

 */

#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label)		\

	mfspr	r13,SPRN_SPRG3;		/* get paca address into r13 */	\

	std	r9,area+EX_R9(r13);	/* save r9 - r12 */		\

	std	r10,area+EX_R10(r13);					\

	std	r11,area+EX_R11(r13);					\

	std	r12,area+EX_R12(r13);					\

	mfspr	r9,SPRN_SPRG1;						\

	std	r9,area+EX_R13(r13);					\

	mfcr	r9;							\

	clrrdi	r12,r13,32;		/* get high part of &label */	\

	mfmsr	r10;							\

	/* force 64bit mode */						\

	li	r11,5;			/* MSR_SF_LG|MSR_ISF_LG */	\

	rldimi	r10,r11,61,0;		/* insert into top 3 bits */	\

	/* done 64bit mode */						\

	mfspr	r11,SPRN_SRR0;		/* save SRR0 */			\

	LOAD_HANDLER(r12,label)						\

	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI;				\

	mtspr	SPRN_SRR0,r12;						\

	mfspr	r12,SPRN_SRR1;		/* and SRR1 */			\

	mtspr	SPRN_SRR1,r10;						\

	rfid;								\

	b	.	/* prevent speculative execution */



#define EXCEPTION_PROLOG_PSERIES(area, label)				\

	mfspr	r13,SPRN_SPRG3;		/* get paca address into r13 */	\

	std	r9,area+EX_R9(r13);	/* save r9 - r12 */		\
@@ -604,14 +635,14 @@ slb_miss_user_pseries: 
system_reset_fwnmi:

	HMT_MEDIUM

	mtspr	SPRN_SPRG1,r13		/* save r13 */

	EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)

	EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXGEN, system_reset_common)



	.globl machine_check_fwnmi

      .align 7

machine_check_fwnmi:

	HMT_MEDIUM

	mtspr	SPRN_SPRG1,r13		/* save r13 */

	EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)

	EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)



#ifdef CONFIG_PPC_ISERIES

/***  ISeries-LPAR interrupt handlers ***/

arch/powerpc/kernel/legacy_serial.c

+8 −5
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index, 
static int __init add_legacy_soc_port(struct device_node *np,

				      struct device_node *soc_dev)

{

	phys_addr_t addr;

	u64 addr;

	u32 *addrp;

	upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
@@ -143,7 +143,7 @@ static int __init add_legacy_isa_port(struct device_node *np, 
	u32 *reg;

	char *typep;

	int index = -1;

	phys_addr_t taddr;

	u64 taddr;



	DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
@@ -165,10 +165,13 @@ static int __init add_legacy_isa_port(struct device_node *np, 
	if (typep && *typep == 'S')

		index = simple_strtol(typep+1, NULL, 0) - 1;



	/* Translate ISA address */

	/* Translate ISA address. If it fails, we still register the port

	 * with no translated address so that it can be picked up as an IO

	 * port later by the serial driver

	 */

	taddr = of_translate_address(np, reg);

	if (taddr == OF_BAD_ADDR)

		return -1;

		taddr = 0;



	/* Add port, irq will be dealt with later */

	return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr,
@@ -180,7 +183,7 @@ static int __init add_legacy_isa_port(struct device_node *np, 
static int __init add_legacy_pci_port(struct device_node *np,

				      struct device_node *pci_dev)

{

	phys_addr_t addr, base;

	u64 addr, base;

	u32 *addrp;

	unsigned int flags;

	int iotype, index = -1, lindex = 0;

arch/powerpc/kernel/misc_64.S

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ _GLOBAL(kexec_sequence) 
	/* clear out hardware hash page table and tlb */

	ld	r5,0(r27)		/* deref function descriptor */

	mtctr	r5

	bctrl				/* ppc_md.hash_clear_all(void); */

	bctrl				/* ppc_md.hpte_clear_all(void); */



/*

 *   kexec image calling is: