diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 15:37:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 15:37:44 -0800 |
| commit | b52b342d31fecfeab0e2a256dfd84ea84954a8d3 (patch) | |
| tree | 9d8a81ef73f2e019db1618c669463bee3ed32ce2 | |
| parent | 5ee540613db504a10e15fafaf4c08cac96aa1823 (diff) | |
| parent | 2d8eedad9233d4771fb3134f50e5c5a09e28352c (diff) | |
| download | samsung-clk-b52b342d31fecfeab0e2a256dfd84ea84954a8d3.tar.gz | |
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
| -rwxr-xr-x | scripts/recordmcount.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index d0da66396f6201..91280b82da0874 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -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; |