diff options
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/setup.c | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index cc240c03efec..727da118bcc1 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h | |||
| @@ -17,7 +17,6 @@ struct sys_timer; | |||
| 17 | struct machine_desc { | 17 | struct machine_desc { |
| 18 | unsigned int nr; /* architecture number */ | 18 | unsigned int nr; /* architecture number */ |
| 19 | const char *name; /* architecture name */ | 19 | const char *name; /* architecture name */ |
| 20 | unsigned long boot_params; /* tagged list */ | ||
| 21 | unsigned long atag_offset; /* tagged list (relative) */ | 20 | unsigned long atag_offset; /* tagged list (relative) */ |
| 22 | const char **dt_compat; /* array of device tree | 21 | const char **dt_compat; /* array of device tree |
| 23 | * 'compatible' strings */ | 22 | * 'compatible' strings */ |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 2737ba3f739c..78d197d6ec34 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -821,25 +821,6 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr) | |||
| 821 | tags = phys_to_virt(__atags_pointer); | 821 | tags = phys_to_virt(__atags_pointer); |
| 822 | else if (mdesc->atag_offset) | 822 | else if (mdesc->atag_offset) |
| 823 | tags = (void *)(PAGE_OFFSET + mdesc->atag_offset); | 823 | tags = (void *)(PAGE_OFFSET + mdesc->atag_offset); |
| 824 | else if (mdesc->boot_params) { | ||
| 825 | #ifdef CONFIG_MMU | ||
| 826 | /* | ||
| 827 | * We still are executing with a minimal MMU mapping created | ||
| 828 | * with the presumption that the machine default for this | ||
| 829 | * is located in the first MB of RAM. Anything else will | ||
| 830 | * fault and silently hang the kernel at this point. | ||
| 831 | */ | ||
| 832 | if (mdesc->boot_params < PHYS_OFFSET || | ||
| 833 | mdesc->boot_params >= PHYS_OFFSET + SZ_1M) { | ||
| 834 | printk(KERN_WARNING | ||
| 835 | "Default boot params at physical 0x%08lx out of reach\n", | ||
| 836 | mdesc->boot_params); | ||
| 837 | } else | ||
| 838 | #endif | ||
| 839 | { | ||
| 840 | tags = phys_to_virt(mdesc->boot_params); | ||
| 841 | } | ||
| 842 | } | ||
| 843 | 824 | ||
| 844 | #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) | 825 | #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) |
| 845 | /* | 826 | /* |
