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: (92 commits)
  powerpc: Remove unused 'protect4gb' boot parameter
  powerpc: Build-in e1000e for pseries & ppc64_defconfig
  powerpc/pseries: Make request_ras_irqs() available to other pseries code
  powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
  powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
  powerpc: Use smt_snooze_delay=-1 to always busy loop
  powerpc: Remove check of ibm,smt-snooze-delay OF property
  powerpc/kdump: Fix race in kdump shutdown
  powerpc/kexec: Fix race in kexec shutdown
  powerpc/kexec: Speedup kexec hash PTE tear down
  powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
  powerpc: Use more accurate limit for first segment memory allocations
  powerpc/kdump: Use chip->shutdown to disable IRQs
  powerpc/kdump: CPUs assume the context of the oopsing CPU
  powerpc/crashdump: Do not fail on NULL pointer dereferencing
  powerpc/eeh: Fix oops when probing in early boot
  powerpc/pci: Check devices status property when scanning OF tree
  powerpc/vio: Switch VIO Bus PM to use generic helpers
  powerpc: Avoid bad relocations in iSeries code
  powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
  ...
This commit is contained in:
Linus Torvalds 2010-05-21 11:17:05 -07:00
commit 79c4581262
118 changed files with 4145 additions and 1140 deletions

View file

@ -1,26 +0,0 @@
#include <linux/spinlock.h>
struct cpustate_t {
spinlock_t lock;
int excl;
int open_count;
unsigned char cached_val;
int inited;
unsigned long *set_addr;
unsigned long *clr_addr;
};
#define HDPU_CPUSTATE_NAME "hdpu cpustate"
#define HDPU_NEXUS_NAME "hdpu nexus"
#define CPUSTATE_KERNEL_MAJOR 0x10
#define CPUSTATE_KERNEL_INIT_DRV 0 /* CPU State Driver Initialized */
#define CPUSTATE_KERNEL_INIT_PCI 1 /* 64360 PCI Busses Init */
#define CPUSTATE_KERNEL_INIT_REG 2 /* 64360 Bridge Init */
#define CPUSTATE_KERNEL_CPU1_KICK 3 /* Boot cpu 1 */
#define CPUSTATE_KERNEL_CPU1_OK 4 /* Cpu 1 has checked in */
#define CPUSTATE_KERNEL_OK 5 /* Terminal state */
#define CPUSTATE_KERNEL_RESET 14 /* Board reset via SW*/
#define CPUSTATE_KERNEL_HALT 15 /* Board halted via SW*/