drm/rockchip: force 8bit mode if vop not support 10bit output

[firefly-linux-kernel-4.4.55.git] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 0c56f6a812bcd9d375aa74cf4b59b7d2b6176e91..0c114e2b01d34a43721e11d9a766cae7c35ae485 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -46,7 +46,6 @@
 #include <linux/oom.h>
 #include <linux/prefetch.h>
 #include <linux/printk.h>
-#include <linux/debugfs.h>
 
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
@@ -221,39 +220,6 @@ static unsigned long get_lru_size(struct lruvec *lruvec, enum lru_list lru)
        return zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru);
 }
 
-struct dentry *debug_file;
-
-static int debug_shrinker_show(struct seq_file *s, void *unused)
-{
-       struct shrinker *shrinker;
-       struct shrink_control sc;
-
-       sc.gfp_mask = -1;
-       sc.nr_to_scan = 0;
-
-       down_read(&shrinker_rwsem);
-       list_for_each_entry(shrinker, &shrinker_list, list) {
-               int num_objs;
-
-               num_objs = shrinker->count_objects(shrinker, &sc);
-               seq_printf(s, "%pf %d\n", shrinker->scan_objects, num_objs);
-       }
-       up_read(&shrinker_rwsem);
-       return 0;
-}
-
-static int debug_shrinker_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, debug_shrinker_show, inode->i_private);
-}
-
-static const struct file_operations debug_shrinker_fops = {
-        .open = debug_shrinker_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 /*
  * Add a shrinker callback to be called from the vm.
  */
@@ -283,15 +249,6 @@ int register_shrinker(struct shrinker *shrinker)
 }
 EXPORT_SYMBOL(register_shrinker);
 
-static int __init add_shrinker_debug(void)
-{
-       debugfs_create_file("shrinker", 0644, NULL, NULL,
-                           &debug_shrinker_fops);
-       return 0;
-}
-
-late_initcall(add_shrinker_debug);
-
 /*
  * Remove one
  */
@@ -2577,7 +2534,7 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc)
                sc->gfp_mask |= __GFP_HIGHMEM;
 
        for_each_zone_zonelist_nodemask(zone, z, zonelist,
-                                       requested_highidx, sc->nodemask) {
+                                       gfp_zone(sc->gfp_mask), sc->nodemask) {
                enum zone_type classzone_idx;
 
                if (!populated_zone(zone))