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

Commit b814469a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu arch fixes from Greg Ungerer:
 "This contains a couple of fixes, both affecting compilation of non-mmu
  m68k targets."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix conditional use of init_pointer_table
  m68knommu: add KMAP definitions for non-MMU definitions
parents 2f91ec8c d6fccc75

arch/m68k/include/asm/pgtable_no.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ extern unsigned int kobjsize(const void *objp); 
 */

#define	VMALLOC_START	0

#define	VMALLOC_END	0xffffffff

#define	KMAP_START	0

#define	KMAP_END	0xffffffff



#include <asm-generic/pgtable.h>

arch/m68k/mm/init.c

+5 −3
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
void *empty_zero_page;

EXPORT_SYMBOL(empty_zero_page);



#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)

extern void init_pointer_table(unsigned long ptable);

extern pmd_t *zero_pgtable;

#endif



#ifdef CONFIG_MMU



pg_data_t pg_data_map[MAX_NUMNODES];
@@ -69,9 +74,6 @@ void __init m68k_setup_node(int node) 
	node_set_online(node);

}



extern void init_pointer_table(unsigned long ptable);

extern pmd_t *zero_pgtable;



#else /* CONFIG_MMU */



/*