On Wed, 21 Feb 2018 23:38:16 +0000
James Hogan <jhogan@xxxxxxxxxx> wrote:
> Now that arch/metag/ has been removed, drop a bunch of metag references
> in various codes across the whole tree:
> - VM_GROWSUP and __VM_ARCH_PECIFIC_1.
> - MT_METAG_* ELF note types.
> - METAG Kconfig dependencies (FRAME_POINTER) and ranges
> (MAX_STACK_SIZE_MB).
> - metag cases in tools (checkstack.pl, recordmcount.c, perf).
>
> Signed-off-by: James Hogan <jhogan@xxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: linux-mm@xxxxxxxxx
> Cc: linux-metag@xxxxxxxxxxxxxxx
> ---
> include/linux/mm.h | 2 --
> include/trace/events/mmflags.h | 2 +-
> include/uapi/linux/elf.h | 3 ---
> lib/Kconfig.debug | 2 +-
> mm/Kconfig | 7 +++----
> scripts/checkstack.pl | 4 ----
> scripts/recordmcount.c | 20 --------------------
Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
-- Steve
> tools/perf/perf-sys.h | 4 ----
> 8 files changed, 5 insertions(+), 39 deletions(-)
> diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
> index dbe1bb058c09..a81cffb76d89 100644
> --- a/include/trace/events/mmflags.h
> +++ b/include/trace/events/mmflags.h
> @@ -115,7 +115,7 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" )
> #define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" }
> #elif defined(CONFIG_PPC)
> #define __VM_ARCH_SPECIFIC_1 {VM_SAO, "sao" }
> -#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64)
> +#elif defined(CONFIG_PARISC) || defined(CONFIG_IA64)
> #define __VM_ARCH_SPECIFIC_1 {VM_GROWSUP, "growsup" }
> #elif !defined(CONFIG_MMU)
> #define __VM_ARCH_SPECIFIC_1 {VM_MAPPED_COPY,"mappedcopy" }
> diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
> index 16e086dcc567..8c9691c3329e 100644
> --- a/scripts/recordmcount.c
> +++ b/scripts/recordmcount.c
> @@ -33,20 +33,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -/*
> - * glibc synced up and added the metag number but didn't add the relocations.
> - * Work around this in a crude manner for now.
> - */
> -#ifndef EM_METAG
> -#define EM_METAG 174
> -#endif
> -#ifndef R_METAG_ADDR32
> -#define R_METAG_ADDR32 2
> -#endif
> -#ifndef R_METAG_NONE
> -#define R_METAG_NONE 3
> -#endif
> -
> #ifndef EM_AARCH64
> #define EM_AARCH64 183
> #define R_AARCH64_NONE 0
> @@ -538,12 +524,6 @@ do_file(char const *const fname)
> gpfx = '_';
> break;
> case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
> - case EM_METAG: reltype = R_METAG_ADDR32;
> - altmcount = "_mcount_wrapper";
> - rel_type_nop = R_METAG_NONE;
> - /* We happen to have the same requirement as MIPS */
> - is_fake_mcount32 = MIPS32_is_fake_mcount;
> - break;
> case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
> case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
> case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break;
--
To unsubscribe from this list: send the line "unsubscribe linux-metag" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
