Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a95bdb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "A few leftovers"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, page_owner: skip unnecessary stack_trace entries
  arm64: stacktrace: avoid listing stacktrace functions in stacktrace
  mm: treewide: remove GFP_TEMPORARY allocation flag
  IB/mlx4: fix sprintf format warning
  fscache: fix fscache_objlist_show format processing
  lib/test_bitmap.c: use ULL suffix for 64-bit constants
  procfs: remove unused variable
  drivers/media/cec/cec-adap.c: fix build with gcc-4.4.4
  idr: remove WARN_ON_ONCE() when trying to replace negative ID
parents 11a19c7b 5f48f0bd

arch/arc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		goto done;

	}



	str = (char *)__get_free_page(GFP_TEMPORARY);

	str = (char *)__get_free_page(GFP_KERNEL);

	if (!str)

		goto done;

arch/arc/kernel/troubleshoot.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void show_regs(struct pt_regs *regs) 
	struct callee_regs *cregs;

	char *buf;



	buf = (char *)__get_free_page(GFP_TEMPORARY);

	buf = (char *)__get_free_page(GFP_KERNEL);

	if (!buf)

		return;

arch/arm64/kernel/stacktrace.c

+13 −5
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace) 
		trace->entries[trace->nr_entries++] = ULONG_MAX;

}



void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)

static noinline void __save_stack_trace(struct task_struct *tsk,

	struct stack_trace *trace, unsigned int nosched)

{

	struct stack_trace_data data;

	struct stackframe frame;
@@ -150,15 +151,16 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) 


	data.trace = trace;

	data.skip = trace->skip;

	data.no_sched_functions = nosched;



	if (tsk != current) {

		data.no_sched_functions = 1;

		frame.fp = thread_saved_fp(tsk);

		frame.pc = thread_saved_pc(tsk);

	} else {

		data.no_sched_functions = 0;

		/* We don't want this function nor the caller */

		data.skip += 2;

		frame.fp = (unsigned long)__builtin_frame_address(0);

		frame.pc = (unsigned long)save_stack_trace_tsk;

		frame.pc = (unsigned long)__save_stack_trace;

	}

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	frame.graph = tsk->curr_ret_stack;
@@ -172,9 +174,15 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) 
}

EXPORT_SYMBOL_GPL(save_stack_trace_tsk);



void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)

{

	__save_stack_trace(tsk, trace, 1);

}



void save_stack_trace(struct stack_trace *trace)

{

	save_stack_trace_tsk(current, trace);

	__save_stack_trace(current, trace, 0);

}



EXPORT_SYMBOL_GPL(save_stack_trace);

#endif

arch/powerpc/kernel/rtas.c

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ int rtas_online_cpus_mask(cpumask_var_t cpus) 
	if (ret) {

		cpumask_var_t tmp_mask;



		if (!alloc_cpumask_var(&tmp_mask, GFP_TEMPORARY))

		if (!alloc_cpumask_var(&tmp_mask, GFP_KERNEL))

			return ret;



		/* Use tmp_mask to preserve cpus mask from first failure */
@@ -962,7 +962,7 @@ int rtas_ibm_suspend_me(u64 handle) 
		return -EIO;

	}



	if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))

	if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL))

		return -ENOMEM;



	atomic_set(&data.working, 0);

arch/powerpc/platforms/pseries/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static ssize_t store_hibernate(struct device *dev, 
	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))

	if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL))

		return -ENOMEM;



	stream_id = simple_strtoul(buf, NULL, 16);