Previous commit removed last reference to ATAG_RAMDISK, so let's remove it Signed-off-by: Askar Safin --- arch/arm/Kconfig | 2 +- arch/arm/include/uapi/asm/setup.h | 10 ---------- arch/arm/kernel/atags_compat.c | 8 -------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b1f3df39ed40..afc161d76c5f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1479,7 +1479,7 @@ config ARM_ATAG_DTB_COMPAT depends on ARM_APPENDED_DTB help Some old bootloaders can't be updated to a DTB capable one, yet - they provide ATAGs with memory configuration, the ramdisk address, + they provide ATAGs with memory configuration, the kernel cmdline string, etc. Such information is dynamically provided by the bootloader and can't always be stored in a static DTB. To allow a device tree enabled kernel to be used with such diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h index 8e50e034fec7..3a70890ce80f 100644 --- a/arch/arm/include/uapi/asm/setup.h +++ b/arch/arm/include/uapi/asm/setup.h @@ -59,15 +59,6 @@ struct tag_videotext { __u16 video_points; }; -/* describes how the ramdisk will be used in kernel */ -#define ATAG_RAMDISK 0x54410004 - -struct tag_ramdisk { - __u32 flags; /* bit 0 = load, bit 1 = prompt */ - __u32 size; /* decompressed ramdisk size in _kilo_ bytes */ - __u32 start; /* starting block of floppy-based RAM disk image */ -}; - /* describes where the compressed ramdisk image lives (virtual address) */ /* * this one accidentally used virtual addresses - as such, @@ -150,7 +141,6 @@ struct tag { struct tag_core core; struct tag_mem32 mem; struct tag_videotext videotext; - struct tag_ramdisk ramdisk; struct tag_initrd initrd; struct tag_serialnr serialnr; struct tag_revision revision; diff --git a/arch/arm/kernel/atags_compat.c b/arch/arm/kernel/atags_compat.c index 10da11c212cc..b9747061fa97 100644 --- a/arch/arm/kernel/atags_compat.c +++ b/arch/arm/kernel/atags_compat.c @@ -122,14 +122,6 @@ static void __init build_tag_list(struct param_struct *params, void *taglist) tag->u.core.pagesize = params->u1.s.page_size; tag->u.core.rootdev = params->u1.s.rootdev; - tag = tag_next(tag); - tag->hdr.tag = ATAG_RAMDISK; - tag->hdr.size = tag_size(tag_ramdisk); - tag->u.ramdisk.flags = (params->u1.s.flags & FLAG_RDLOAD ? 1 : 0) | - (params->u1.s.flags & FLAG_RDPROMPT ? 2 : 0); - tag->u.ramdisk.size = params->u1.s.ramdisk_size; - tag->u.ramdisk.start = params->u1.s.rd_start; - tag = tag_next(tag); tag->hdr.tag = ATAG_INITRD; tag->hdr.size = tag_size(tag_initrd); -- 2.47.2