Pull arch/tile ftrace bug fix from Chris Metcalf: "This fixes a build failure with allyesconfig reported by Fengguang Wu and fixed by Tony Lu" * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: ftrace: default to tilegx if ARCH=tile is specified
Unified · Split
| @@ -364,7 +364,8 @@ if ($arch eq "x86_64") { · 363 unmodified lines | |||
| 364 | } elsif ($arch eq "blackfin") { | 364 | } elsif ($arch eq "blackfin") { |
| 365 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; | 365 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; |
| 366 | $mcount_adjust = -4; | 366 | $mcount_adjust = -4; |
| 367 | } elsif ($arch eq "tilegx") { | 367 | } elsif ($arch eq "tilegx" || $arch eq "tile") { |
| 368 | # Default to the newer TILE-Gx architecture if only "tile" is given. | ||
| 368 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; | 369 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; |
| 369 | $type = ".quad"; | 370 | $type = ".quad"; |
| 370 | $alignment = 8; | 371 | $alignment = 8; |