mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'akpm' (patches from Andrew)
Merge third patchbomb from Andrew Morton:
- the rest of MM
- scripts/gdb updates
- ipc/ updates
- lib/ updates
- MAINTAINERS updates
- various other misc things
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (67 commits)
genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
genalloc: rename dev_get_gen_pool() to gen_pool_get()
x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit
MAINTAINERS: add zpool
MAINTAINERS: BCACHE: Kent Overstreet has changed email address
MAINTAINERS: move Jens Osterkamp to CREDITS
MAINTAINERS: remove unused nbd.h pattern
MAINTAINERS: update brcm gpio filename pattern
MAINTAINERS: update brcm dts pattern
MAINTAINERS: update sound soc intel patterns
MAINTAINERS: remove website for paride
MAINTAINERS: update Emulex ocrdma email addresses
bcache: use kvfree() in various places
libcxgbi: use kvfree() in cxgbi_free_big_mem()
target: use kvfree() in session alloc and free
IB/ehca: use kvfree() in ipz_queue_{cd}tor()
drm/nouveau/gem: use kvfree() in u_free()
drm: use kvfree() in drm_free_large()
cxgb4: use kvfree() in t4_free_mem()
cxgb3: use kvfree() in cxgb_free_mem()
...
This commit is contained in:
commit
2d01eedf1d
74 changed files with 894 additions and 339 deletions
|
|
@ -92,6 +92,12 @@ void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
|
|||
}
|
||||
EXPORT_SYMBOL(__gcov_merge_time_profile);
|
||||
|
||||
void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters)
|
||||
{
|
||||
/* Unused. */
|
||||
}
|
||||
EXPORT_SYMBOL(__gcov_merge_icall_topn);
|
||||
|
||||
/**
|
||||
* gcov_enable_events - enable event reporting through gcov_event()
|
||||
*
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@
|
|||
#include <linux/vmalloc.h>
|
||||
#include "gcov.h"
|
||||
|
||||
#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9
|
||||
#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
|
||||
#define GCOV_COUNTERS 10
|
||||
#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
|
||||
#define GCOV_COUNTERS 9
|
||||
#else
|
||||
#define GCOV_COUNTERS 8
|
||||
|
|
|
|||
|
|
@ -84,6 +84,17 @@ struct resource crashk_low_res = {
|
|||
|
||||
int kexec_should_crash(struct task_struct *p)
|
||||
{
|
||||
/*
|
||||
* If crash_kexec_post_notifiers is enabled, don't run
|
||||
* crash_kexec() here yet, which must be run after panic
|
||||
* notifiers in panic().
|
||||
*/
|
||||
if (crash_kexec_post_notifiers)
|
||||
return 0;
|
||||
/*
|
||||
* There are 4 panic() calls in do_exit() path, each of which
|
||||
* corresponds to each of these 4 conditions.
|
||||
*/
|
||||
if (in_interrupt() || !p->pid || is_global_init(p) || panic_on_oops)
|
||||
return 1;
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ static unsigned long tainted_mask;
|
|||
static int pause_on_oops;
|
||||
static int pause_on_oops_flag;
|
||||
static DEFINE_SPINLOCK(pause_on_oops_lock);
|
||||
static bool crash_kexec_post_notifiers;
|
||||
bool crash_kexec_post_notifiers;
|
||||
int panic_on_warn __read_mostly;
|
||||
|
||||
int panic_timeout = CONFIG_PANIC_TIMEOUT;
|
||||
|
|
@ -142,7 +142,8 @@ void panic(const char *fmt, ...)
|
|||
* Note: since some panic_notifiers can make crashed kernel
|
||||
* more unstable, it can increase risks of the kdump failure too.
|
||||
*/
|
||||
crash_kexec(NULL);
|
||||
if (crash_kexec_post_notifiers)
|
||||
crash_kexec(NULL);
|
||||
|
||||
bust_spinlocks(0);
|
||||
|
||||
|
|
|
|||
|
|
@ -207,14 +207,14 @@ static int console_may_schedule;
|
|||
* need to be changed in the future, when the requirements change.
|
||||
*
|
||||
* /dev/kmsg exports the structured data in the following line format:
|
||||
* "<level>,<sequnum>,<timestamp>,<contflag>;<message text>\n"
|
||||
* "<level>,<sequnum>,<timestamp>,<contflag>[,additional_values, ... ];<message text>\n"
|
||||
*
|
||||
* Users of the export format should ignore possible additional values
|
||||
* separated by ',', and find the message after the ';' character.
|
||||
*
|
||||
* The optional key/value pairs are attached as continuation lines starting
|
||||
* with a space character and terminated by a newline. All possible
|
||||
* non-prinatable characters are escaped in the "\xff" notation.
|
||||
*
|
||||
* Users of the export format should ignore possible additional values
|
||||
* separated by ',', and find the message after the ';' character.
|
||||
*/
|
||||
|
||||
enum log_flags {
|
||||
|
|
|
|||
|
|
@ -81,10 +81,7 @@ static struct page **relay_alloc_page_array(unsigned int n_pages)
|
|||
*/
|
||||
static void relay_free_page_array(struct page **array)
|
||||
{
|
||||
if (is_vmalloc_addr(array))
|
||||
vfree(array);
|
||||
else
|
||||
kfree(array);
|
||||
kvfree(array);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue