diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
| commit | 20f96e606509ee5084690179afe1810b95617a92 (patch) | |
| tree | 895c5fd7fd8b3d6c7a4afda9c82dc02bbe5fcc7a /arch/arm/kernel/atags_parse.c | |
| parent | 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 (diff) | |
| parent | fc2933c133744305236793025b00c2f7d258b687 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/kernel/atags_parse.c')
| -rw-r--r-- | arch/arm/kernel/atags_parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 6c12d9fe694e..373b61f9a4f0 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -174,7 +174,7 @@ static void __init squash_mem_tags(struct tag *tag) } const struct machine_desc * __init -setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) +setup_machine_tags(void *atags_vaddr, unsigned int machine_nr) { struct tag *tags = (struct tag *)&default_tags; const struct machine_desc *mdesc = NULL, *p; @@ -195,8 +195,8 @@ setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) if (!mdesc) return NULL; - if (__atags_pointer) - tags = phys_to_virt(__atags_pointer); + if (atags_vaddr) + tags = atags_vaddr; else if (mdesc->atag_offset) tags = (void *)(PAGE_OFFSET + mdesc->atag_offset); |