Skip to content

Commit 5f17157

Browse files
committed
Drop a bunch of metag references
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_SPECIFIC_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 <[email protected]> Acked-by: Steven Rostedt (VMware) <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: [email protected] Cc: [email protected]
1 parent 6a76768 commit 5f17157

File tree

9 files changed

+5
-40
lines changed

9 files changed

+5
-40
lines changed

include/linux/cpuhotplug.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ enum cpuhp_state {
108108
CPUHP_AP_PERF_X86_CQM_STARTING,
109109
CPUHP_AP_PERF_X86_CSTATE_STARTING,
110110
CPUHP_AP_PERF_XTENSA_STARTING,
111-
CPUHP_AP_PERF_METAG_STARTING,
112111
CPUHP_AP_MIPS_OP_LOONGSON3_STARTING,
113112
CPUHP_AP_ARM_SDEI_STARTING,
114113
CPUHP_AP_ARM_VFP_STARTING,

include/linux/mm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@ extern unsigned int kobjsize(const void *objp);
241241
# define VM_SAO VM_ARCH_1 /* Strong Access Ordering (powerpc) */
242242
#elif defined(CONFIG_PARISC)
243243
# define VM_GROWSUP VM_ARCH_1
244-
#elif defined(CONFIG_METAG)
245-
# define VM_GROWSUP VM_ARCH_1
246244
#elif defined(CONFIG_IA64)
247245
# define VM_GROWSUP VM_ARCH_1
248246
#elif !defined(CONFIG_MMU)

include/trace/events/mmflags.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" )
115115
#define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" }
116116
#elif defined(CONFIG_PPC)
117117
#define __VM_ARCH_SPECIFIC_1 {VM_SAO, "sao" }
118-
#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64)
118+
#elif defined(CONFIG_PARISC) || defined(CONFIG_IA64)
119119
#define __VM_ARCH_SPECIFIC_1 {VM_GROWSUP, "growsup" }
120120
#elif !defined(CONFIG_MMU)
121121
#define __VM_ARCH_SPECIFIC_1 {VM_MAPPED_COPY,"mappedcopy" }

include/uapi/linux/elf.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,6 @@ typedef struct elf64_shdr {
420420
#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */
421421
#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */
422422
#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */
423-
#define NT_METAG_CBUF 0x500 /* Metag catch buffer registers */
424-
#define NT_METAG_RPIPE 0x501 /* Metag read pipeline state */
425-
#define NT_METAG_TLS 0x502 /* Metag TLS pointer */
426423
#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
427424

428425
/* Note header in a PT_NOTE section */

lib/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ config FRAME_POINTER
356356
bool "Compile the kernel with frame pointers"
357357
depends on DEBUG_KERNEL && \
358358
(CRIS || M68K || FRV || UML || \
359-
SUPERH || BLACKFIN || MN10300 || METAG) || \
359+
SUPERH || BLACKFIN || MN10300) || \
360360
ARCH_WANT_FRAME_POINTERS
361361
default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
362362
help

mm/Kconfig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,15 +627,14 @@ config GENERIC_EARLY_IOREMAP
627627
config MAX_STACK_SIZE_MB
628628
int "Maximum user stack size for 32-bit processes (MB)"
629629
default 80
630-
range 8 256 if METAG
631630
range 8 2048
632631
depends on STACK_GROWSUP && (!64BIT || COMPAT)
633632
help
634633
This is the maximum stack size in Megabytes in the VM layout of 32-bit
635634
user processes when the stack grows upwards (currently only on parisc
636-
and metag arch). The stack will be located at the highest memory
637-
address minus the given value, unless the RLIMIT_STACK hard limit is
638-
changed to a smaller value in which case that is used.
635+
arch). The stack will be located at the highest memory address minus
636+
the given value, unless the RLIMIT_STACK hard limit is changed to a
637+
smaller value in which case that is used.
639638

640639
A sane initial value is 80 MB.
641640

scripts/checkstack.pl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@
6464
# 2b6c: 4e56 fb70 linkw %fp,#-1168
6565
# 1df770: defc ffe4 addaw #-28,%sp
6666
$re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;
67-
} elsif ($arch eq 'metag') {
68-
#400026fc: 40 00 00 82 ADD A0StP,A0StP,#0x8
69-
$re = qr/.*ADD.*A0StP,A0StP,\#(0x$x{1,8})/o;
70-
$funcre = qr/^$x* <[^\$](.*)>:$/;
7167
} elsif ($arch eq 'mips64') {
7268
#8800402c: 67bdfff0 daddiu sp,sp,-16
7369
$re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;

scripts/recordmcount.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,6 @@
3333
#include <string.h>
3434
#include <unistd.h>
3535

36-
/*
37-
* glibc synced up and added the metag number but didn't add the relocations.
38-
* Work around this in a crude manner for now.
39-
*/
40-
#ifndef EM_METAG
41-
#define EM_METAG 174
42-
#endif
43-
#ifndef R_METAG_ADDR32
44-
#define R_METAG_ADDR32 2
45-
#endif
46-
#ifndef R_METAG_NONE
47-
#define R_METAG_NONE 3
48-
#endif
49-
5036
#ifndef EM_AARCH64
5137
#define EM_AARCH64 183
5238
#define R_AARCH64_NONE 0
@@ -538,12 +524,6 @@ do_file(char const *const fname)
538524
gpfx = '_';
539525
break;
540526
case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
541-
case EM_METAG: reltype = R_METAG_ADDR32;
542-
altmcount = "_mcount_wrapper";
543-
rel_type_nop = R_METAG_NONE;
544-
/* We happen to have the same requirement as MIPS */
545-
is_fake_mcount32 = MIPS32_is_fake_mcount;
546-
break;
547527
case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
548528
case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
549529
case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break;

tools/perf/perf-sys.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
#define CPUINFO_PROC {"Processor"}
4747
#endif
4848

49-
#ifdef __metag__
50-
#define CPUINFO_PROC {"CPU"}
51-
#endif
52-
5349
#ifdef __xtensa__
5450
#define CPUINFO_PROC {"core ID"}
5551
#endif

0 commit comments

Comments
 (0)