Skip to content

Commit

Permalink
ARM: remove boot_params from struct machine_desc
Browse files Browse the repository at this point in the history
Now that there is no more users, we can remove it from the kernel.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Aug 21, 2011
1 parent 0cc9311 commit af68716
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
1 change: 0 additions & 1 deletion arch/arm/include/asm/mach/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ struct sys_timer;
struct machine_desc {
unsigned int nr; /* architecture number */
const char *name; /* architecture name */
unsigned long boot_params; /* tagged list */
unsigned long atag_offset; /* tagged list (relative) */
const char **dt_compat; /* array of device tree
* 'compatible' strings */
Expand Down
19 changes: 0 additions & 19 deletions arch/arm/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -821,25 +821,6 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr)
tags = phys_to_virt(__atags_pointer);
else if (mdesc->atag_offset)
tags = (void *)(PAGE_OFFSET + mdesc->atag_offset);
else if (mdesc->boot_params) {
#ifdef CONFIG_MMU
/*
* We still are executing with a minimal MMU mapping created
* with the presumption that the machine default for this
* is located in the first MB of RAM. Anything else will
* fault and silently hang the kernel at this point.
*/
if (mdesc->boot_params < PHYS_OFFSET ||
mdesc->boot_params >= PHYS_OFFSET + SZ_1M) {
printk(KERN_WARNING
"Default boot params at physical 0x%08lx out of reach\n",
mdesc->boot_params);
} else
#endif
{
tags = phys_to_virt(mdesc->boot_params);
}
}

#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
/*
Expand Down

0 comments on commit af68716

Please sign in to comment.