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

Commit 7bfeab9a authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: include proper prototypes for rodata_test 



extern should not appear in C files.  Also, the definitions
do not match the prototype currently, not sure what way you
want to go with this, I've switched the prototype to return
int, but I can see going to the void return as well.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 184652eb

arch/x86/kernel/test_rodata.c

+1 −1
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 * of the License.

 */

#include <linux/module.h>

#include <asm/cacheflush.h>

#include <asm/sections.h>

extern int rodata_test_data;



int rodata_test(void)

{

arch/x86/mm/init_32.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/sections.h>

#include <asm/paravirt.h>

#include <asm/setup.h>

#include <asm/cacheflush.h>



unsigned int __VMALLOC_RESERVE = 128 << 20;

arch/x86/mm/init_64.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/sections.h>

#include <asm/kdebug.h>

#include <asm/numa.h>

#include <asm/cacheflush.h>



const struct dma_mapping_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);

include/asm-x86/cacheflush.h

+5 −2
Original line number Diff line number Diff line
@@ -48,12 +48,15 @@ void cpa_init(void); 


#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

extern const int rodata_test_data;

#endif



#ifdef CONFIG_DEBUG_RODATA_TEST

void rodata_test(void);

int rodata_test(void);

#else

static inline void rodata_test(void)

static inline int rodata_test(void)

{

	return 0;

}

#endif