diff options
author | Praneeth Bajjuri | 2013-04-16 17:52:14 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2013-04-16 17:52:14 -0500 |
commit | 79b8cdc3f1d584ba364133a5995755e2e5913368 (patch) | |
tree | e3bbf01b0601c6c1e0c0f80df17fbc5ddbe22c95 /kernel | |
parent | dfb23ecfcb8a7f9d5b5555edcf6369a162d4397c (diff) | |
parent | 19a56e50a91f875597920d593060c4e81d7a2838 (diff) | |
download | kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.tar.gz kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.tar.xz kernel-video-79b8cdc3f1d584ba364133a5995755e2e5913368.zip |
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
* origin/p-ti-linux-3.8.y: (114 commits)
drm.h: Fix DRM compilation with bare-metal toolchain
Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
mmc:fix max discard sectors limit
arm: configs: disable unused sata configs
ARM: dts: omap3-beagle-xm: Add USB Host support
dmaengine: OMAP: Register SDMA controller with Device Tree DMA driver
ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
USB: ehci-omap: Fix stale dma_mask on repeated modprobe/rmmod
ARM: omap2plus_defconfig: Enable USB Video class drivers
usb: dwc3: set 'mode' based on selected Kconfig choices
usb: dwc3: remove dwc3 dependency on host AND gadget.
drivers: usb: otg: palmas: enable VBUS on ID connect interrupt
drivers: regulator: palmas: add an API to set/clear the switch bit on SMPS10
usb: dwc3: gadget: free trb pool only from epnum 2
ARM: OMAP: Display: Fix compile issues
ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
ARM/dts: omap5-sevm: Enable palmas on i2c1 bus
ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
ARM: dts: AM33XX: Enable system power off control in am335x-bone
ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
...
Conflicts:
drivers/hid/hid-magicmouse.c
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/ftrace.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b27052cc3ee..64bc5d856bb 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -4537,12 +4537,8 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, | |||
4537 | ftrace_startup_sysctl(); | 4537 | ftrace_startup_sysctl(); |
4538 | 4538 | ||
4539 | /* we are starting ftrace again */ | 4539 | /* we are starting ftrace again */ |
4540 | if (ftrace_ops_list != &ftrace_list_end) { | 4540 | if (ftrace_ops_list != &ftrace_list_end) |
4541 | if (ftrace_ops_list->next == &ftrace_list_end) | 4541 | update_ftrace_function(); |
4542 | ftrace_trace_function = ftrace_ops_list->func; | ||
4543 | else | ||
4544 | ftrace_trace_function = ftrace_ops_list_func; | ||
4545 | } | ||
4546 | 4542 | ||
4547 | } else { | 4543 | } else { |
4548 | /* stopping ftrace calls (just send to ftrace_stub) */ | 4544 | /* stopping ftrace calls (just send to ftrace_stub) */ |