forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into perf/core

Browse source 
Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2010-07-21 21:43:03 +02:00
commit 9dcdbf7a33
579 changed files with 6107 additions and 198260 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/early_res.c
View file

@ -7,6 +7,8 @@
#include <linux/bootmem.h>
#include <linux/mm.h>
#include <linux/early_res.h>
#include <linux/slab.h>
#include <linux/kmemleak.h>
/*
* Early reserved memory areas.
@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end)
struct early_res *r;
int i;
kmemleak_free_part(__va(start), end - start);
i = find_overlapped_early(start, end);
r = &early_res[i];
if (i >= max_early_res || r->end != end || r->start != start)
@ -333,6 +337,8 @@ void __init free_early_partial(u64 start, u64 end)
struct early_res *r;
int i;
kmemleak_free_part(__va(start), end - start);
if (start == end)
return;