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

Commit ef4ed97d authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/lmb' 

Conflicts:
	arch/sh/kernel/setup.c
parents c5eb5b37 21823259

arch/sh/include/asm/io_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ void IO_CONCAT(__IO_PREFIX,iounmap)(void *addr); 


void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size);

void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr);

void IO_CONCAT(__IO_PREFIX,mem_init)(void);



#undef __IO_PREFIX

arch/sh/include/asm/kexec.h

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_SH



#ifdef CONFIG_KEXEC

/* arch/sh/kernel/machine_kexec.c */

void reserve_crashkernel(void);



static inline void crash_setup_regs(struct pt_regs *newregs,

				    struct pt_regs *oldregs)

{
@@ -59,4 +63,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
		newregs->pc = (unsigned long)current_text_addr();

	}

}

#else

static inline void reserve_crashkernel(void) { }

#endif /* CONFIG_KEXEC */



#endif /* __ASM_SH_KEXEC_H */

arch/sh/include/asm/machvec.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ struct sh_machine_vector { 


	int (*mv_clk_init)(void);

	int (*mv_mode_pins)(void);



	void (*mv_mem_init)(void);

};



extern struct sh_machine_vector sh_mv;

arch/sh/include/asm/mmzone.h

+2 −1
Original line number Diff line number Diff line
@@ -42,9 +42,10 @@ setup_bootmem_node(int nid, unsigned long start, unsigned long end) 
void __init plat_mem_setup(void);



/* arch/sh/kernel/setup.c */

void __init setup_bootmem_allocator(unsigned long start_pfn);

void __init __add_active_range(unsigned int nid, unsigned long start_pfn,

			       unsigned long end_pfn);

/* arch/sh/mm/init.c */

void __init allocate_pgdat(unsigned int nid);



#endif /* __KERNEL__ */

#endif /* __ASM_SH_MMZONE_H */

arch/sh/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


extern unsigned long shm_align_mask;

extern unsigned long max_low_pfn, min_low_pfn;

extern unsigned long memory_start, memory_end;

extern unsigned long memory_start, memory_end, memory_limit;



static inline unsigned long

pages_do_alias(unsigned long addr1, unsigned long addr2)