Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98011f56 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

mm: fix improper .init-type section references 



.. which modpost started warning about.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 140d5a49

kernel/kthread.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int kthread_stop(struct task_struct *k) 
EXPORT_SYMBOL(kthread_stop);





static __init void kthreadd_setup(void)

static noinline __init_refok void kthreadd_setup(void)

{

	struct task_struct *tsk = current;

mm/page_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -126,13 +126,13 @@ static unsigned long __meminitdata dma_reserve; 
    #endif

  #endif



  struct node_active_region __meminitdata early_node_map[MAX_ACTIVE_REGIONS];

  int __meminitdata nr_nodemap_entries;

  unsigned long __meminitdata arch_zone_lowest_possible_pfn[MAX_NR_ZONES];

  unsigned long __meminitdata arch_zone_highest_possible_pfn[MAX_NR_ZONES];

  static struct node_active_region __meminitdata early_node_map[MAX_ACTIVE_REGIONS];

  static int __meminitdata nr_nodemap_entries;

  static unsigned long __meminitdata arch_zone_lowest_possible_pfn[MAX_NR_ZONES];

  static unsigned long __meminitdata arch_zone_highest_possible_pfn[MAX_NR_ZONES];

#ifdef CONFIG_MEMORY_HOTPLUG_RESERVE

  unsigned long __initdata node_boundary_start_pfn[MAX_NUMNODES];

  unsigned long __initdata node_boundary_end_pfn[MAX_NUMNODES];

  static unsigned long __meminitdata node_boundary_start_pfn[MAX_NUMNODES];

  static unsigned long __meminitdata node_boundary_end_pfn[MAX_NUMNODES];

#endif /* CONFIG_MEMORY_HOTPLUG_RESERVE */

#endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
@@ -2599,7 +2599,7 @@ void __init push_node_boundaries(unsigned int nid, 
}



/* If necessary, push the node boundary out for reserve hotadd */

static void __init account_node_boundary(unsigned int nid,

static void __meminit account_node_boundary(unsigned int nid,

		unsigned long *start_pfn, unsigned long *end_pfn)

{

	printk(KERN_DEBUG "Entering account_node_boundary(%u, %lu, %lu)\n",
@@ -2619,7 +2619,7 @@ static void __init account_node_boundary(unsigned int nid, 
void __init push_node_boundaries(unsigned int nid,

		unsigned long start_pfn, unsigned long end_pfn) {}



static void __init account_node_boundary(unsigned int nid,

static void __meminit account_node_boundary(unsigned int nid,

		unsigned long *start_pfn, unsigned long *end_pfn) {}

#endif