From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 29 Jun 2006 18:32:34 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.18-rc1~358
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3aa590c6b7c89d844f81c2e96f295cf2c6967773;p=~andy%2Flinux

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

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (43 commits)
  [POWERPC] Use little-endian bit from firmware ibm,pa-features property
  [POWERPC] Make sure smp_processor_id works very early in boot
  [POWERPC] U4 DART improvements
  [POWERPC] todc: add support for Time-Of-Day-Clock
  [POWERPC] Make lparcfg.c work when both iseries and pseries are selected
  [POWERPC] Fix idr locking in init_new_context
  [POWERPC] mpc7448hpc2 (taiga) board config file
  [POWERPC] Add tsi108 pci and platform device data register function
  [POWERPC] Add general support for mpc7448hpc2 (Taiga) platform
  [POWERPC] Correct the MAX_CONTEXT definition
  powerpc: minor cleanups for mpc86xx
  [POWERPC] Make sure we select CONFIG_NEW_LEDS if ADB_PMU_LED is set
  [POWERPC] Simplify the code defining the 64-bit CPU features
  [POWERPC] powerpc: kconfig warning fix
  [POWERPC] Consolidate some of kernel/misc*.S
  [POWERPC] Remove unused function call_with_mmu_off
  [POWERPC] update asm-powerpc/time.h
  [POWERPC] Clean up it_lp_queue.h
  [POWERPC] Skip the "copy down" of the kernel if it is already at zero.
  [POWERPC] Add the use of the firmware soft-reset-nmi to kdump.
  ...
---

3aa590c6b7c89d844f81c2e96f295cf2c6967773
diff --cc arch/powerpc/kernel/crash.c
index 22ceba844bf,b537cfa4e09..358cecdc6ae
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@@ -190,18 -281,15 +281,15 @@@ void default_machine_crash_shutdown(str
  	local_irq_disable();
  
  	for_each_irq(irq) {
 -		struct irq_desc *desc = irq_descp(irq);
 +		struct irq_desc *desc = irq_desc + irq;
  
  		if (desc->status & IRQ_INPROGRESS)
 -			desc->handler->end(irq);
 +			desc->chip->end(irq);
  
  		if (!(desc->status & IRQ_DISABLED))
 -			desc->handler->disable(irq);
 +			desc->chip->disable(irq);
  	}
  
- 	if (ppc_md.kexec_cpu_down)
- 		ppc_md.kexec_cpu_down(1, 0);
- 
  	/*
  	 * Make a note of crashing cpu. Will be used in machine_kexec
  	 * such that another IPI will not be sent.