diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-15 22:22:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-15 22:22:34 -0700 |
| commit | 49df0ab20dace1376a227b5e69bc2235410cd443 (patch) | |
| tree | 77a1faf48dd4be9b7b735ef9929333eaa98323a7 | |
| parent | b813c182ebd70d09765ae359afcf52b21633546c (diff) | |
| parent | 11d9efadc0baf44a973674c42a3497768a8cf246 (diff) | |
Merge "soc: qcom: boot_stats: Fix place_marker API"
| -rw-r--r-- | include/soc/qcom/boot_stats.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/soc/qcom/boot_stats.h b/include/soc/qcom/boot_stats.h index b76d5676b555..5b82aa0bedc3 100644 --- a/include/soc/qcom/boot_stats.h +++ b/include/soc/qcom/boot_stats.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014,2016 The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2014,2016,2018 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -41,6 +41,6 @@ unsigned long long int msm_timer_get_sclk_ticks(void) { return 0; } static inline int boot_marker_enabled(void) { return 1; } void place_marker(const char *name); #else -inline void place_marker(char *name); +static inline void place_marker(char *name) { }; static inline int boot_marker_enabled(void) { return 0; } #endif |