diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /mm | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/highmem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 7da4a7b6af11..e16e1523b688 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #ifdef CONFIG_HIGHMEM | 40 | #ifdef CONFIG_HIGHMEM |
| 41 | 41 | ||
| 42 | unsigned long totalhigh_pages __read_mostly; | 42 | unsigned long totalhigh_pages __read_mostly; |
| 43 | EXPORT_SYMBOL(totalhigh_pages); | ||
| 43 | 44 | ||
| 44 | unsigned int nr_free_highpages (void) | 45 | unsigned int nr_free_highpages (void) |
| 45 | { | 46 | { |