redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  spi/spi_sh_msiof: fix a wrong free_irq() parameter
  dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
hifive-unleashed-5.1
Linus Torvalds 2011-01-17 11:18:40 -08:00
parent 1a47f7a84e d95defaca7
commit 8c34482c17
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/kernel/prom.c
View File

@ -47,9 +47,9 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
memblock_add(base, size); memblock_add(base, size);
} }
u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
{ {
return memblock_alloc(size, align); return __va(memblock_alloc(size, align));
} }
#ifdef CONFIG_EARLY_PRINTK #ifdef CONFIG_EARLY_PRINTK

6
arch/mips/kernel/prom.c
View File

@ -45,11 +45,9 @@ void __init free_mem_mach(unsigned long addr, unsigned long size)
return free_bootmem(addr, size); return free_bootmem(addr, size);
} }
u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
{ {
return virt_to_phys( return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
__alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS))
);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD

4
arch/powerpc/kernel/prom.c
View File

@ -519,9 +519,9 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
memblock_add(base, size); memblock_add(base, size);
} }
u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
{ {
return memblock_alloc(size, align); return __va(memblock_alloc(size, align));
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD

8
drivers/of/fdt.c
View File

@ -692,12 +692,6 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
return 1; return 1;
} }
static void *__init early_device_tree_alloc(u64 size, u64 align)
{
unsigned long mem = early_init_dt_alloc_memory_arch(size, align);
return __va(mem);
}
/** /**
* unflatten_device_tree - create tree of device_nodes from flat blob * unflatten_device_tree - create tree of device_nodes from flat blob
* *
@ -709,7 +703,7 @@ static void *__init early_device_tree_alloc(u64 size, u64 align)
void __init unflatten_device_tree(void) void __init unflatten_device_tree(void)
{ {
__unflatten_device_tree(initial_boot_params, &allnodes, __unflatten_device_tree(initial_boot_params, &allnodes,
early_device_tree_alloc); early_init_dt_alloc_memory_arch);
/* Get pointer to OF "/chosen" node for use everywhere */ /* Get pointer to OF "/chosen" node for use everywhere */
of_chosen = of_find_node_by_path("/chosen"); of_chosen = of_find_node_by_path("/chosen");

2
drivers/spi/spi_sh_msiof.c
View File

@ -635,7 +635,7 @@ static int sh_msiof_spi_remove(struct platform_device *pdev)
ret = spi_bitbang_stop(&p->bitbang); ret = spi_bitbang_stop(&p->bitbang);
if (!ret) { if (!ret) {
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
free_irq(platform_get_irq(pdev, 0), sh_msiof_spi_irq); free_irq(platform_get_irq(pdev, 0), p);
iounmap(p->mapbase); iounmap(p->mapbase);
clk_put(p->clk); clk_put(p->clk);
spi_master_put(p->bitbang.master); spi_master_put(p->bitbang.master);

2
include/linux/of_fdt.h
View File

@ -97,7 +97,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node);
extern int early_init_dt_scan_memory(unsigned long node, const char *uname, extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data); int depth, void *data);
extern void early_init_dt_add_memory_arch(u64 base, u64 size); extern void early_init_dt_add_memory_arch(u64 base, u64 size);
extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align); extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
extern u64 dt_mem_next_cell(int s, __be32 **cellp); extern u64 dt_mem_next_cell(int s, __be32 **cellp);
/* /*