On Tue, Mar 16, 2021 at 12:02 AM Martin KaFai Lau <kafai@xxxxxx> wrote:
>
> This patch renames RELO_EXTERN to RELO_EXTERN_VAR.
> It is to avoid the confusion with a later patch adding
> RELO_EXTERN_FUNC.
>
> Signed-off-by: Martin KaFai Lau <kafai@xxxxxx>
> ---
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> tools/lib/bpf/libbpf.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 8355b786b3db..8f924aece736 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -189,7 +189,7 @@ enum reloc_type {
> RELO_LD64,
> RELO_CALL,
> RELO_DATA,
> - RELO_EXTERN,
> + RELO_EXTERN_VAR,
> RELO_SUBPROG_ADDR,
> };
>
> @@ -3463,7 +3463,7 @@ static int bpf_program__record_reloc(struct bpf_program *prog,
> }
> pr_debug("prog '%s': found extern #%d '%s' (sym %d) for insn #%u\n",
> prog->name, i, ext->name, ext->sym_idx, insn_idx);
> - reloc_desc->type = RELO_EXTERN;
> + reloc_desc->type = RELO_EXTERN_VAR;
> reloc_desc->insn_idx = insn_idx;
> reloc_desc->sym_off = i; /* sym_off stores extern index */
> return 0;
> @@ -6226,7 +6226,7 @@ bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog)
> insn[0].imm = obj->maps[relo->map_idx].fd;
> relo->processed = true;
> break;
> - case RELO_EXTERN:
> + case RELO_EXTERN_VAR:
> ext = &obj->externs[relo->sym_off];
> if (ext->type == EXT_KCFG) {
> insn[0].src_reg = BPF_PSEUDO_MAP_VALUE;
> --
> 2.30.2
>
