forked from luck/tmp_suning_uos_patched
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
This commit is contained in:
commit
b52b342d31
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user