diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 12:10:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 12:10:16 -0500 |
| commit | 85da1fb545e5fe51c35e0576f71780cc557f4277 (patch) | |
| tree | 59566f93ed45a4c8481b43aadff784c80aebacdc /arch/powerpc/include/asm/kexec.h | |
| parent | 73ac36ea14fd18ea3dc057e41b16ff31a3c0bd5a (diff) | |
| parent | 5886188dc7ba9a76babcd37452f44079a9a77f71 (diff) | |
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: (53 commits)
serial: Add driver for the Cell Network Processor serial port NWP device
powerpc: enable dynamic ftrace
powerpc/cell: Fix the prototype of create_vma_map()
powerpc/mm: Make clear_fixmap() actually work
powerpc/kdump: Use ppc_save_regs() in crash_setup_regs()
powerpc: Export cacheable_memzero as its now used in a driver
powerpc: Fix missing semicolons in mmu_decl.h
powerpc/pasemi: local_irq_save uses an unsigned long
powerpc/cell: Fix some u64 vs. long types
powerpc/cell: Use correct types in beat files
powerpc: Use correct type in prom_init.c
powerpc: Remove unnecessary casts
mtd/ps3vram: Use _PAGE_NO_CACHE in memory ioremap
mtd/ps3vram: Use msleep in waits
mtd/ps3vram: Use proper kernel types
mtd/ps3vram: Cleanup ps3vram driver messages
mtd/ps3vram: Remove ps3vram debug routines
mtd/ps3vram: Add modalias support to the ps3vram driver
mtd/ps3vram: Add ps3vram driver for accessing video RAM as MTD
powerpc: Fix iseries drivers build failure without CONFIG_VIOPATH
...
Diffstat (limited to 'arch/powerpc/include/asm/kexec.h')
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 6dbffc981702..7e06b43720d3 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
| @@ -48,63 +48,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
| 48 | { | 48 | { |
| 49 | if (oldregs) | 49 | if (oldregs) |
| 50 | memcpy(newregs, oldregs, sizeof(*newregs)); | 50 | memcpy(newregs, oldregs, sizeof(*newregs)); |
| 51 | #ifdef __powerpc64__ | ||
| 52 | else { | ||
| 53 | /* FIXME Merge this with xmon_save_regs ?? */ | ||
| 54 | unsigned long tmp1, tmp2; | ||
| 55 | __asm__ __volatile__ ( | ||
| 56 | "std 0,0(%2)\n" | ||
| 57 | "std 1,8(%2)\n" | ||
| 58 | "std 2,16(%2)\n" | ||
| 59 | "std 3,24(%2)\n" | ||
| 60 | "std 4,32(%2)\n" | ||
| 61 | "std 5,40(%2)\n" | ||
| 62 | "std 6,48(%2)\n" | ||
| 63 | "std 7,56(%2)\n" | ||
| 64 | "std 8,64(%2)\n" | ||
| 65 | "std 9,72(%2)\n" | ||
| 66 | "std 10,80(%2)\n" | ||
| 67 | "std 11,88(%2)\n" | ||
| 68 | "std 12,96(%2)\n" | ||
| 69 | "std 13,104(%2)\n" | ||
| 70 | "std 14,112(%2)\n" | ||
| 71 | "std 15,120(%2)\n" | ||
| 72 | "std 16,128(%2)\n" | ||
| 73 | "std 17,136(%2)\n" | ||
| 74 | "std 18,144(%2)\n" | ||
| 75 | "std 19,152(%2)\n" | ||
| 76 | "std 20,160(%2)\n" | ||
| 77 | "std 21,168(%2)\n" | ||
| 78 | "std 22,176(%2)\n" | ||
| 79 | "std 23,184(%2)\n" | ||
| 80 | "std 24,192(%2)\n" | ||
| 81 | "std 25,200(%2)\n" | ||
| 82 | "std 26,208(%2)\n" | ||
| 83 | "std 27,216(%2)\n" | ||
| 84 | "std 28,224(%2)\n" | ||
| 85 | "std 29,232(%2)\n" | ||
| 86 | "std 30,240(%2)\n" | ||
| 87 | "std 31,248(%2)\n" | ||
| 88 | "mfmsr %0\n" | ||
| 89 | "std %0, 264(%2)\n" | ||
| 90 | "mfctr %0\n" | ||
| 91 | "std %0, 280(%2)\n" | ||
| 92 | "mflr %0\n" | ||
| 93 | "std %0, 288(%2)\n" | ||
| 94 | "bl 1f\n" | ||
| 95 | "1: mflr %1\n" | ||
| 96 | "std %1, 256(%2)\n" | ||
| 97 | "mtlr %0\n" | ||
| 98 | "mfxer %0\n" | ||
| 99 | "std %0, 296(%2)\n" | ||
| 100 | : "=&r" (tmp1), "=&r" (tmp2) | ||
| 101 | : "b" (newregs) | ||
| 102 | : "memory"); | ||
| 103 | } | ||
| 104 | #else | ||
| 105 | else | 51 | else |
| 106 | ppc_save_regs(newregs); | 52 | ppc_save_regs(newregs); |
| 107 | #endif /* __powerpc64__ */ | ||
| 108 | } | 53 | } |
| 109 | 54 | ||
| 110 | extern void kexec_smp_wait(void); /* get and clear naca physid, wait for | 55 | extern void kexec_smp_wait(void); /* get and clear naca physid, wait for |