aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/mca.c4
-rw-r--r--arch/ia64/mm/tlb.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 5586926dd85d..71209766c47f 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -361,9 +361,9 @@ static ia64_state_log_t ia64_state_log[IA64_MAX_LOG_TYPES];
361 361
362#define IA64_LOG_ALLOCATE(it, size) \ 362#define IA64_LOG_ALLOCATE(it, size) \
363 {ia64_state_log[it].isl_log[IA64_LOG_CURR_INDEX(it)] = \ 363 {ia64_state_log[it].isl_log[IA64_LOG_CURR_INDEX(it)] = \
364 (ia64_err_rec_t *)alloc_bootmem(size); \ 364 (ia64_err_rec_t *)memblock_alloc(size, 0); \
365 ia64_state_log[it].isl_log[IA64_LOG_NEXT_INDEX(it)] = \ 365 ia64_state_log[it].isl_log[IA64_LOG_NEXT_INDEX(it)] = \
366 (ia64_err_rec_t *)alloc_bootmem(size);} 366 (ia64_err_rec_t *)memblock_alloc(size, 0);}
367#define IA64_LOG_LOCK_INIT(it) spin_lock_init(&ia64_state_log[it].isl_lock) 367#define IA64_LOG_LOCK_INIT(it) spin_lock_init(&ia64_state_log[it].isl_lock)
368#define IA64_LOG_LOCK(it) spin_lock_irqsave(&ia64_state_log[it].isl_lock, s) 368#define IA64_LOG_LOCK(it) spin_lock_irqsave(&ia64_state_log[it].isl_lock, s)
369#define IA64_LOG_UNLOCK(it) spin_unlock_irqrestore(&ia64_state_log[it].isl_lock,s) 369#define IA64_LOG_UNLOCK(it) spin_unlock_irqrestore(&ia64_state_log[it].isl_lock,s)
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index acf10eb9da15..5554863b4c9b 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -59,8 +59,8 @@ struct ia64_tr_entry *ia64_idtrs[NR_CPUS];
59void __init 59void __init
60mmu_context_init (void) 60mmu_context_init (void)
61{ 61{
62 ia64_ctx.bitmap = alloc_bootmem((ia64_ctx.max_ctx+1)>>3); 62 ia64_ctx.bitmap = memblock_alloc((ia64_ctx.max_ctx + 1) >> 3, 0);
63 ia64_ctx.flushmap = alloc_bootmem((ia64_ctx.max_ctx+1)>>3); 63 ia64_ctx.flushmap = memblock_alloc((ia64_ctx.max_ctx + 1) >> 3, 0);
64} 64}
65 65
66/* 66/*