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

Commit 70f56cbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull arch/nios2 updates from Ley Foon Tan:

 - add screen_info

 - Convert pfn_valid to static inline

 - Extend !__ASSEMBLY__ section in asm/page.h

* tag 'nios2-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: add screen_info
  nios2: Convert pfn_valid to static inline
  nios2: Extend !__ASSEMBLY__ section in asm/page.h
parents de399813 744606c7

arch/nios2/include/asm/page.h

+11 −4
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ extern unsigned long memory_size; 


extern struct page *mem_map;



#endif /* !__ASSEMBLY__ */



# define __pa(x)		\

	((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)

# define __va(x)		\
@@ -87,8 +85,15 @@ extern struct page *mem_map; 
	((void *)(((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)



# define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)

# define pfn_valid(pfn)		((pfn) >= ARCH_PFN_OFFSET &&	\

					(pfn) < max_mapnr)



static inline bool pfn_valid(unsigned long pfn)

{

	/* avoid <linux/mm.h> include hell */

	extern unsigned long max_mapnr;

	unsigned long pfn_offset = ARCH_PFN_OFFSET;



	return pfn >= pfn_offset && pfn < max_mapnr;

}



# define virt_to_page(vaddr)	pfn_to_page(PFN_DOWN(virt_to_phys(vaddr)))

# define virt_addr_valid(vaddr)	pfn_valid(PFN_DOWN(virt_to_phys(vaddr)))
@@ -106,4 +111,6 @@ extern struct page *mem_map; 


#include <asm-generic/getorder.h>



#endif /* !__ASSEMBLY__ */



#endif /* _ASM_NIOS2_PAGE_H */

arch/nios2/kernel/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/bootmem.h>

#include <linux/initrd.h>

#include <linux/of_fdt.h>

#include <linux/screen_info.h>



#include <asm/mmu_context.h>

#include <asm/sections.h>
@@ -36,6 +37,10 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
					0, 0, 0, 0, 0, 0,

					0};



#ifdef CONFIG_VT

struct screen_info screen_info;

#endif



/* Copy a short hook instruction sequence to the exception address */

static inline void copy_exception_handler(unsigned int addr)

{