diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-11 03:20:15 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-11 03:20:15 +0300 |
| commit | d8c0282f4da6d5335fee56141ca92284026f4818 (patch) | |
| tree | 264153c2762ef1682cc685700139b6948bbeb1f6 /arch/powerpc/platforms | |
| parent | 58bffb5bbb238d56e8818acb463cce990021fa32 (diff) | |
| parent | 8c50b72a3b4f1f7cdfdfebd233b1cbd121262e65 (diff) | |
| download | linux-d8c0282f4da6d5335fee56141ca92284026f4818.tar.xz | |
Merge branch 'topic/mprofile-kernel' into next
Merge the ftrace changes to support -mprofile-kernel on ppc64le. This is
a prerequisite for live patching, the support for which will be merged
via the livepatch tree based on this topic branch.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powermac/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile index 52c6ce1cc985..1eb7b45e017d 100644 --- a/arch/powerpc/platforms/powermac/Makefile +++ b/arch/powerpc/platforms/powermac/Makefile @@ -2,7 +2,7 @@ CFLAGS_bootx_init.o += -fPIC ifdef CONFIG_FUNCTION_TRACER # Do not trace early boot code -CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog +CFLAGS_REMOVE_bootx_init.o = -mno-sched-epilog $(CC_FLAGS_FTRACE) endif obj-y += pic.o setup.o time.o feature.o pci.o \ |