Metag architecture changes for v4.7

3 minor fixes:
 - removal of stale comment
 - fix build for Meta1 when perf events are enabled
 - fix inline asm constraint in atomics
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXOaRpAAoJEGwLaZPeOHZ6vLwP/18EzVrzMIyj3AtI/IWrrKd3
 ouTq0W18Pdzcn8DbqP1SS0IzwNk9KqOFNbsmgW0yQEEvDroWy4Gpci32ioyi8sJL
 VCGQx6/LKNNyH0nwhnxIP/dhpODO30gdnSkBwVCeSN/ozcIBaF9eDqHNcoifLPOa
 aoJb68SnZ6xCMfD7HuwErrow+z/y3vyKFcq5zwRAQuUBJsoPJGon6YiofNNs2qCR
 5qCrYyQiQPyMEEA2w6NMyiGBid5dlS1ZiR6OTddg9eyWXbs92GTMJBux3+kizMrc
 KzdOQ91aT/fzc/wsDCDHSyDEuegXvcwMohYfa1Fgi65aVAkhPuRzt7ZeO/3NarK9
 LDVkPfuiuC5dorwlWcl5s5tZXaNPmMdK+mg6Q7GL7/QleVjZvacmsX0JKZh9Zh8F
 lwpBPagDt5tzlY/0lqQEMfX6zxunYTTRYDyn0RiOYkcOiwCHQnDgUWczDmIOs41z
 ggIoqyBYtS57eeOFCUbfhaq5USpoEMAZfgbVKO+coHw6iNchLwGB9IGw56nwJB0G
 JMwjm5XRiaynin2PyQ4mfri+h6vEwpQYWbqVJGzRC98TYRajAn4SS1BRDtd+/11b
 6IfY00TW7v+VeJex9MRb5dO8tGg3xX4Db8lemEyMP7Gec+l3m+JZJfEWNZ6x1N8E
 FPQUDivSn6Etwn/0l1my
 =WG30
 -----END PGP SIGNATURE-----

Merge tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull metag architecture updates from James Hogan:
 "Three minor fixes:

   - removal of stale comment
   - fix build for Meta1 when perf events are enabled
   - fix inline asm constraint in atomics"

* tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: Fix atomic_*_return inline asm constraints
  metag: perf: fix build on Meta1
  metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init

arch/metag/include/asm/atomic_lnkget.h

@@ -61,7 +61,7 @@ static inline int atomic_##op##_return(int i, atomic_t *v)		\
 		"	CMPT	%0, #HI(0x02000000)\n"			\
 		"	BNZ 1b\n"					\
 		: "=&d" (temp), "=&da" (result)				\
-		: "da" (&v->counter), "bd" (i)				\
+		: "da" (&v->counter), "br" (i)				\
 		: "cc");						\
 									\
 	smp_mb();							\

arch/metag/kernel/ftrace.c

@@ -115,7 +115,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
 	return ftrace_modify_code(ip, old, new);
 }
 
-/* run from kstop_machine */
 int __init ftrace_dyn_arch_init(void)
 {
 	return 0;

arch/metag/kernel/perf/perf_event.c

@@ -618,6 +618,8 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
 
 	/* Check for a core internal or performance channel event. */
 	if (tmp) {
+		/* PERF_ICORE/PERF_CHAN only exist since Meta2 */
+#ifdef METAC_2_1
 		void *perf_addr;
 
 		/*
@@ -640,6 +642,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
 
 		if (perf_addr)
 			metag_out32((config & 0x0f), perf_addr);
+#endif
 
 		/*
 		 * Now we use the high nibble as the performance event to