Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52b342d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

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
parents 5ee54061 2d8eedad

scripts/recordmcount.pl

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,8 @@ if ($arch eq "x86_64") { 
} elsif ($arch eq "blackfin") {

    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$";

    $mcount_adjust = -4;

} elsif ($arch eq "tilegx") {

} elsif ($arch eq "tilegx" || $arch eq "tile") {

    # Default to the newer TILE-Gx architecture if only "tile" is given.

    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$";

    $type = ".quad";

    $alignment = 8;