Skip to contentSkip to conversation

mm: mminit_loglevel cannot be __meminitdata anymore

PATCH In review Marcin Slusarz 2 participants 2 messages Aug 15, 2008 – Aug 18, 2008

Subsystems (2)
Memory management memblock and memory management initialization
lore
Share & tools
lore

Marcin Slusarz

author
#0 lore raw

PATCH 1/1 mm: mminit_loglevel cannot be __meminitdata anymore

mminit_loglevel is now used from mminit_verify_zonelist <- build_all_zonelists <-

1. online_pages <- memory_block_action <- memory_block_change_state <- store_mem_state (sys handler)
2. numa_zonelist_order_handler (proc handler)

so it cannot be annotated __meminit - drop it

fixes following section mismatch warning:
WARNING: vmlinux.o(.text+0x71628): Section mismatch in reference from the function mminit_verify_zonelist() to the variable .meminit.data:mminit_loglevel The function mminit_verify_zonelist() references
the variable __meminitdata mminit_loglevel.
This is often because mminit_verify_zonelist lacks a __meminitdata
annotation or the annotation of mminit_loglevel is wrong.

Signed-off-by Marcin Slusarz <[email protected]>
Cc Mel Gorman <[email protected]>
Cc Andrew Morton <[email protected]>
---
 mm/mm_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/mm_init.c +1 -1
index 936ef2e..4e0e265 100644
@@ -12,7 +12,7 @@
 #include "internal.h"
 
 #ifdef CONFIG_DEBUG_MEMORY_INIT
-int __meminitdata mminit_loglevel;
+int mminit_loglevel;
 
 #ifndef SECTIONS_SHIFT
 #define SECTIONS_SHIFT	0
Signature · 1 line
1.5.4.5
Acked-by on v1 1/1
#1 lore raw

On (15/08/08 23:02), Marcin Slusarz didst pronounce:

Quoted 14 lines

mminit_loglevel is now used from mminit_verify_zonelist <- build_all_zonelists <-

1. online_pages <- memory_block_action <- memory_block_change_state <- store_mem_state (sys handler)
2. numa_zonelist_order_handler (proc handler)

so it cannot be annotated __meminit - drop it

fixes following section mismatch warning:
WARNING: vmlinux.o(.text+0x71628): Section mismatch in reference from the function mminit_verify_zonelist() to the variable .meminit.data:mminit_loglevel The function mminit_verify_zonelist() references
the variable __meminitdata mminit_loglevel.
This is often because mminit_verify_zonelist lacks a __meminitdata
annotation or the annotation of mminit_loglevel is wrong.

Quoted 3 lines
Signed-off-by Marcin Slusarz <[email protected]>
Cc Mel Gorman <[email protected]>
Cc Andrew Morton <[email protected]>
Acked-by Mel Gorman <[email protected]>
Quoted 20 lines
---
 mm/mm_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/mm_init.c +1 -1
index 936ef2e..4e0e265 100644
@@ -12,7 +12,7 @@
 #include "internal.h"
 
 #ifdef CONFIG_DEBUG_MEMORY_INIT
-int __meminitdata mminit_loglevel;
+int mminit_loglevel;
 
 #ifndef SECTIONS_SHIFT
 #define SECTIONS_SHIFT	0
Signature · 1 line
1.5.4.5
Signature · 3 lines
Mel Gorman
Part-time Phd Student                          Linux Technology Center
University of Limerick                         IBM Dublin Software Lab