From d9e119a079c8864935b731b8b28568388cd5097b Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Tue, 22 Dec 2009 12:23:06 -0800 Subject: [PATCH] core: canonicalize ROOT_FS_OPS ROOT_FS_OPS belongs in .rodata, and make it the same format. Signed-off-by: H. Peter Anvin --- core/extlinux.asm | 7 ++++--- core/ldlinux.asm | 6 ++++-- core/pxelinux.asm | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/extlinux.asm b/core/extlinux.asm index c7cea51..1ac749b 100644 --- a/core/extlinux.asm +++ b/core/extlinux.asm @@ -24,11 +24,12 @@ ; my_id equ extlinux_id + section .rodata + alignz 4 +ROOT_FS_OPS: extern ext2_fs_ops + dd ext2_fs_ops extern btrfs_fs_ops - - section .rodata -ROOT_FS_OPS dd ext2_fs_ops dd btrfs_fs_ops dd 0 diff --git a/core/ldlinux.asm b/core/ldlinux.asm index 599d760..23540ea 100644 --- a/core/ldlinux.asm +++ b/core/ldlinux.asm @@ -30,9 +30,11 @@ ; my_id equ syslinux_id - extern vfat_fs_ops section .rodata -ROOT_FS_OPS dd vfat_fs_ops + alignz 4 +ROOT_FS_OPS: + extern vfat_fs_ops + dd vfat_fs_ops dd 0 %include "diskfs.inc" diff --git a/core/pxelinux.asm b/core/pxelinux.asm index c71b07b..7f5da49 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -312,7 +312,7 @@ efi_csm_hack_size equ $-efi_csm_hack mov eax,ROOT_FS_OPS pm_call fs_init - section .data + section .rodata alignz 4 ROOT_FS_OPS: extern pxe_fs_ops -- 2.7.4