projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[linux-2.6-microblaze.git]
/
mm
/
highmem.c
diff --git
a/mm/highmem.c
b/mm/highmem.c
index
be8f8d3
..
35d4773
100644
(file)
--- a/
mm/highmem.c
+++ b/
mm/highmem.c
@@
-46,9
+46,14
@@
unsigned int nr_free_highpages (void)
pg_data_t *pgdat;
unsigned int pages = 0;
pg_data_t *pgdat;
unsigned int pages = 0;
- for_each_online_pgdat(pgdat)
+ for_each_online_pgdat(pgdat)
{
pages += zone_page_state(&pgdat->node_zones[ZONE_HIGHMEM],
NR_FREE_PAGES);
pages += zone_page_state(&pgdat->node_zones[ZONE_HIGHMEM],
NR_FREE_PAGES);
+ if (zone_movable_is_highmem())
+ pages += zone_page_state(
+ &pgdat->node_zones[ZONE_MOVABLE],
+ NR_FREE_PAGES);
+ }
return pages;
}
return pages;
}
@@
-158,7
+163,7
@@
start:
return vaddr;
}
return vaddr;
}
-void
fastcall
*kmap_high(struct page *page)
+void *kmap_high(struct page *page)
{
unsigned long vaddr;
{
unsigned long vaddr;
@@
-180,7
+185,7
@@
void fastcall *kmap_high(struct page *page)
EXPORT_SYMBOL(kmap_high);
EXPORT_SYMBOL(kmap_high);
-void
fastcall
kunmap_high(struct page *page)
+void kunmap_high(struct page *page)
{
unsigned long vaddr;
unsigned long nr;
{
unsigned long vaddr;
unsigned long nr;