[patch 09/28] cpu alloc: crash_notes conversion

[Christoph Lameter <clameter@sgi.com>]

[-- Attachment #1: cpu_alloc_kexec --]
[-- Type: text/plain, Size: 2669 bytes --]

Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
 arch/ia64/kernel/crash.c |    2 +-
 drivers/base/cpu.c       |    3 ++-
 kernel/kexec.c           |    5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6/kernel/kexec.c
===================================================================
--- linux-2.6.orig/kernel/kexec.c	2007-10-26 17:52:21.593476581 -0700
+++ linux-2.6/kernel/kexec.c	2007-11-05 11:32:23.422191793 -0800
@@ -24,6 +24,7 @@
 #include <linux/utsrelease.h>
 #include <linux/utsname.h>
 #include <linux/numa.h>
+#include <linux/cpu_alloc.h>
 
 #include <asm/page.h>
 #include <asm/uaccess.h>
@@ -1122,7 +1123,7 @@ void crash_save_cpu(struct pt_regs *regs
 	 * squirrelled away.  ELF notes happen to provide
 	 * all of that, so there is no need to invent something new.
 	 */
-	buf = (u32*)per_cpu_ptr(crash_notes, cpu);
+	buf = (u32*)CPU_PTR(crash_notes, cpu);
 	if (!buf)
 		return;
 	memset(&prstatus, 0, sizeof(prstatus));
@@ -1136,7 +1137,7 @@ void crash_save_cpu(struct pt_regs *regs
 static int __init crash_notes_memory_init(void)
 {
 	/* Allocate memory for saving cpu registers. */
-	crash_notes = alloc_percpu(note_buf_t);
+	crash_notes = CPU_ALLOC(note_buf_t, GFP_KERNEL|__GFP_ZERO);
 	if (!crash_notes) {
 		printk("Kexec: Memory allocation for saving cpu register"
 		" states failed\n");
Index: linux-2.6/drivers/base/cpu.c
===================================================================
--- linux-2.6.orig/drivers/base/cpu.c	2007-10-26 17:52:00.852693291 -0700
+++ linux-2.6/drivers/base/cpu.c	2007-11-05 11:32:50.005821748 -0800
@@ -10,6 +10,7 @@
 #include <linux/topology.h>
 #include <linux/device.h>
 #include <linux/node.h>
+#include <linux/cpu_alloc.h>
 
 #include "base.h"
 
@@ -95,7 +96,7 @@ static ssize_t show_crash_notes(struct s
 	 * boot up and this data does not change there after. Hence this
 	 * operation should be safe. No locking required.
 	 */
-	addr = __pa(per_cpu_ptr(crash_notes, cpunum));
+	addr = __pa(CPU_PTR(crash_notes, cpunum));
 	rc = sprintf(buf, "%Lx\n", addr);
 	return rc;
 }
Index: linux-2.6/arch/ia64/kernel/crash.c
===================================================================
--- linux-2.6.orig/arch/ia64/kernel/crash.c	2007-10-26 17:51:57.652573158 -0700
+++ linux-2.6/arch/ia64/kernel/crash.c	2007-11-05 11:26:27.323321824 -0800
@@ -71,7 +71,7 @@ crash_save_this_cpu(void)
 	dst[46] = (unsigned long)ia64_rse_skip_regs((unsigned long *)dst[46],
 			sof - sol);
 
-	buf = (u64 *) per_cpu_ptr(crash_notes, cpu);
+	buf = (u64 *) CPU_PTR(crash_notes, cpu);
 	if (!buf)
 		return;
 	buf = append_elf_note(buf, KEXEC_CORE_NOTE_NAME, NT_PRSTATUS, prstatus,

--