drm/radeon/dpm: adjust power state properly for UVD on SI

[linux-imx.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 3194ec414728ffab13034cf0082ce2a6dff77a0b..308d50331bc353e69f00b8ef7ea78555b1426224 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -79,7 +79,6 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
 {
        unsigned long root = SECTION_NR_TO_ROOT(section_nr);
        struct mem_section *section;
-       int ret = 0;
 
        if (mem_section[root])
                return -EEXIST;
@@ -90,7 +89,7 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
 
        mem_section[root] = section;
 
-       return ret;
+       return 0;
 }
 #else /* !SPARSEMEM_EXTREME */
 static inline int sparse_index_init(unsigned long section_nr, int nid)
@@ -754,6 +753,7 @@ out:
        return ret;
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
 #ifdef CONFIG_MEMORY_FAILURE
 static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
 {
@@ -775,7 +775,6 @@ static inline void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
 }
 #endif
 
-#ifdef CONFIG_MEMORY_HOTREMOVE
 static void free_section_usemap(struct page *memmap, unsigned long *usemap)
 {
        struct page *usemap_page;