sparc64: Don't use alloc_bootmem() in init_IRQ() code paths.
The page allocator and SLAB are available at this point now, and if we still try to use bootmem allocations here the kernel spits out warnings. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
28d0325ce6
commit
14a2ff6ed2
|
@ -20,7 +20,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/irq.h>
|
||||
|
||||
#include <asm/ptrace.h>
|
||||
|
@ -914,25 +913,19 @@ void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu)
|
|||
tb->nonresum_qmask);
|
||||
}
|
||||
|
||||
static void __init alloc_one_mondo(unsigned long *pa_ptr, unsigned long qmask)
|
||||
/* Each queue region must be a power of 2 multiple of 64 bytes in
|
||||
* size. The base real address must be aligned to the size of the
|
||||
* region. Thus, an 8KB queue must be 8KB aligned, for example.
|
||||
*/
|
||||
static void __init alloc_one_queue(unsigned long *pa_ptr, unsigned long qmask)
|
||||
{
|
||||
unsigned long size = PAGE_ALIGN(qmask + 1);
|
||||
void *p = __alloc_bootmem(size, size, 0);
|
||||
unsigned long order = get_order(size);
|
||||
unsigned long p;
|
||||
|
||||
p = __get_free_pages(GFP_KERNEL, order);
|
||||
if (!p) {
|
||||
prom_printf("SUN4V: Error, cannot allocate mondo queue.\n");
|
||||
prom_halt();
|
||||
}
|
||||
|
||||
*pa_ptr = __pa(p);
|
||||
}
|
||||
|
||||
static void __init alloc_one_kbuf(unsigned long *pa_ptr, unsigned long qmask)
|
||||
{
|
||||
unsigned long size = PAGE_ALIGN(qmask + 1);
|
||||
void *p = __alloc_bootmem(size, size, 0);
|
||||
|
||||
if (!p) {
|
||||
prom_printf("SUN4V: Error, cannot allocate kbuf page.\n");
|
||||
prom_printf("SUN4V: Error, cannot allocate queue.\n");
|
||||
prom_halt();
|
||||
}
|
||||
|
||||
|
@ -942,11 +935,11 @@ static void __init alloc_one_kbuf(unsigned long *pa_ptr, unsigned long qmask)
|
|||
static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb)
|
||||
{
|
||||
#ifdef CONFIG_SMP
|
||||
void *page;
|
||||
unsigned long page;
|
||||
|
||||
BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > (PAGE_SIZE - 64));
|
||||
|
||||
page = alloc_bootmem_pages(PAGE_SIZE);
|
||||
page = get_zeroed_page(GFP_KERNEL);
|
||||
if (!page) {
|
||||
prom_printf("SUN4V: Error, cannot allocate cpu mondo page.\n");
|
||||
prom_halt();
|
||||
|
@ -965,13 +958,13 @@ static void __init sun4v_init_mondo_queues(void)
|
|||
for_each_possible_cpu(cpu) {
|
||||
struct trap_per_cpu *tb = &trap_block[cpu];
|
||||
|
||||
alloc_one_mondo(&tb->cpu_mondo_pa, tb->cpu_mondo_qmask);
|
||||
alloc_one_mondo(&tb->dev_mondo_pa, tb->dev_mondo_qmask);
|
||||
alloc_one_mondo(&tb->resum_mondo_pa, tb->resum_qmask);
|
||||
alloc_one_kbuf(&tb->resum_kernel_buf_pa, tb->resum_qmask);
|
||||
alloc_one_mondo(&tb->nonresum_mondo_pa, tb->nonresum_qmask);
|
||||
alloc_one_kbuf(&tb->nonresum_kernel_buf_pa,
|
||||
tb->nonresum_qmask);
|
||||
alloc_one_queue(&tb->cpu_mondo_pa, tb->cpu_mondo_qmask);
|
||||
alloc_one_queue(&tb->dev_mondo_pa, tb->dev_mondo_qmask);
|
||||
alloc_one_queue(&tb->resum_mondo_pa, tb->resum_qmask);
|
||||
alloc_one_queue(&tb->resum_kernel_buf_pa, tb->resum_qmask);
|
||||
alloc_one_queue(&tb->nonresum_mondo_pa, tb->nonresum_qmask);
|
||||
alloc_one_queue(&tb->nonresum_kernel_buf_pa,
|
||||
tb->nonresum_qmask);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -999,7 +992,7 @@ void __init init_IRQ(void)
|
|||
kill_prom_timer();
|
||||
|
||||
size = sizeof(struct ino_bucket) * NUM_IVECS;
|
||||
ivector_table = alloc_bootmem(size);
|
||||
ivector_table = kzalloc(size, GFP_KERNEL);
|
||||
if (!ivector_table) {
|
||||
prom_printf("Fatal error, cannot allocate ivector_table\n");
|
||||
prom_halt();
|
||||
|
|
Loading…
Reference in New Issue