From 85dcf388d9e22e5cb90ca8cecfb04a0eceaeb80a Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Tue, 6 Nov 2007 11:33:52 -0800 Subject: [PATCH] cpu alloc: crash_notes conversion Signed-off-by: Christoph Lameter --- arch/ia64/kernel/crash.c | 2 +- drivers/base/cpu.c | 2 +- kernel/kexec.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6/arch/ia64/kernel/crash.c =================================================================== --- linux-2.6.orig/arch/ia64/kernel/crash.c 2008-04-29 14:55:47.000000000 -0700 +++ linux-2.6/arch/ia64/kernel/crash.c 2008-05-21 21:39:24.000000000 -0700 @@ -72,7 +72,7 @@ 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, Index: linux-2.6/drivers/base/cpu.c =================================================================== --- linux-2.6.orig/drivers/base/cpu.c 2008-05-07 22:15:29.000000000 -0700 +++ linux-2.6/drivers/base/cpu.c 2008-05-21 21:39:24.000000000 -0700 @@ -95,7 +95,7 @@ * 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/kernel/kexec.c =================================================================== --- linux-2.6.orig/kernel/kexec.c 2008-05-07 22:15:36.000000000 -0700 +++ linux-2.6/kernel/kexec.c 2008-05-21 21:39:24.000000000 -0700 @@ -1121,7 +1121,7 @@ * 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)); @@ -1135,7 +1135,7 @@ 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");