Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / drivers / video / fbdev / acornfb.c

diff --git a/drivers/video/fbdev/acornfb.c b/drivers/video/fbdev/acornfb.c
index bcc92aecf66682838a04f9f8e41eaa96397296d3..1b72edc01cfb58378c00c2a148685f35dfda1aab 100644 (file)
--- a/drivers/video/fbdev/acornfb.c
+++ b/drivers/video/fbdev/acornfb.c
@@ -921,40 +921,6 @@ static int acornfb_detect_monitortype(void)
        return 4;
 }
 
-/*
- * This enables the unused memory to be freed on older Acorn machines.
- * We are freeing memory on behalf of the architecture initialisation
- * code here.
- */
-static inline void
-free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
-{
-       int mb_freed = 0;
-
-       /*
-        * Align addresses
-        */
-       virtual_start = PAGE_ALIGN(virtual_start);
-       virtual_end = PAGE_ALIGN(virtual_end);
-
-       while (virtual_start < virtual_end) {
-               struct page *page;
-
-               /*
-                * Clear page reserved bit,
-                * set count to 1, and free
-                * the page.
-                */
-               page = virt_to_page(virtual_start);
-               __free_reserved_page(page);
-
-               virtual_start += PAGE_SIZE;
-               mb_freed += PAGE_SIZE / 1024;
-       }
-
-       printk("acornfb: freed %dK memory\n", mb_freed);
-}
-
 static int acornfb_probe(struct platform_device *dev)
 {
        unsigned long size;