Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (228 commits) ftrace: build fix for ftraced_suspend ftrace: separate out the function enabled variable ftrace: add ftrace_kill_atomic ftrace: use current CPU for function startup ftrace: start wakeup tracing after setting function tracer ftrace: check proper config for preempt type ftrace: trace schedule ftrace: define function trace nop ftrace: move sched_switch enable after markers ftrace: prevent ftrace modifications while being kprobe'd, v2 fix "ftrace: store mcount address in rec->ip" mmiotrace broken in linux-next (8-bit writes only) ftrace: avoid modifying kprobe'd records ftrace: freeze kprobe'd records kprobes: enable clean usage of get_kprobe ftrace: store mcount address in rec->ip ftrace: build fix with gcc 4.3 namespacecheck: fixes ftrace: fix "notrace" filtering priority ftrace: fix printout ...
This commit is contained in:
@ -126,8 +126,6 @@ static void background_writeout(unsigned long _min_pages);
|
||||
static struct prop_descriptor vm_completions;
|
||||
static struct prop_descriptor vm_dirties;
|
||||
|
||||
static unsigned long determine_dirtyable_memory(void);
|
||||
|
||||
/*
|
||||
* couple the period to the dirty_ratio:
|
||||
*
|
||||
@ -347,7 +345,13 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
|
||||
#endif
|
||||
}
|
||||
|
||||
static unsigned long determine_dirtyable_memory(void)
|
||||
/**
|
||||
* determine_dirtyable_memory - amount of memory that may be used
|
||||
*
|
||||
* Returns the numebr of pages that can currently be freed and used
|
||||
* by the kernel for direct mappings.
|
||||
*/
|
||||
unsigned long determine_dirtyable_memory(void)
|
||||
{
|
||||
unsigned long x;
|
||||
|
||||
|
Reference in New Issue
Block a user