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

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

Merge tag 'for-linus' of git://github.com/gxt/linux 

Pull UniCore32 bug fixes from Guan Xuetao:
 "This includes bugfixes to make unicore32 successfully build under
  defconfig, and some changes for allmodconfig (though not finished)"

* tag 'for-linus' of git://github.com/gxt/linux:
  unicore32: Remove ARCH_HAS_CPUFREQ config option
  UniCore32: Change git tree location information in MAINTAINERS
  arch: unicore32: ksyms: export '__cpuc_coherent_kern_range' to avoid compiling failure
  arch: unicore32: ksyms: export 'pm_power_off' to avoid compiling failure.
  arch: unicore32: ksyms: export additional find_first_*() to avoid compiling failure
  arch:unicore32:mm: add devmem_is_allowed() to support STRICT_DEVMEM
  unicore32: include: asm: add missing ')' for PAGE_* macros in pgtable.h
  arch/unicore32/kernel/setup.c: add generic 'screen_info' to avoid compiling failure
  drivers: scsi: mvsas: fix compiling issue by adding 'MVS_' for "enum pci_interrupt_cause"
  arch: unicore32: kernel: ksyms: remove 'bswapsi2' and 'muldi3' to avoid compiling failure
  arch/unicore32/kernel/ksyms.c: remove 2 export symbols to avoid compiling failure
  drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0
  drivers/rtc/rtc-puv3.c: use dev_dbg() instead of dev_debug() for typo issue
  arch/unicore32/include/asm/io.h: add readl_relaxed() generic definition
  arch/unicore32/include/asm/ptrace.h: add generic definition for profile_pc()
  arch/unicore32/mm/alignment.c: include "asm/pgtable.h" to avoid compiling error
  arch/unicore32/kernel/clock.c: add readl() and writel() for 'PM_' macros
  arch/unicore32/kernel/module.c: use __vmalloc_node_range() instead of __vmalloc_area()
  arch/unicore32/kernel/ksyms.c: remove several undefined exported symbols
parents 60761c10 d670878e

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6960,7 +6960,7 @@ PKUNITY SOC DRIVERS 
M:	Guan Xuetao <gxt@mprc.pku.edu.cn>

W:	http://mprc.pku.edu.cn/~guanxuetao/linux

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git

T:	git git://github.com/gxt/linux.git

F:	drivers/input/serio/i8042-unicore32io.h

F:	drivers/i2c/busses/i2c-puv3.c

F:	drivers/video/fb-puv3.c
@@ -9277,7 +9277,7 @@ UNICORE32 ARCHITECTURE: 
M:	Guan Xuetao <gxt@mprc.pku.edu.cn>

W:	http://mprc.pku.edu.cn/~guanxuetao/linux

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git

T:	git git://github.com/gxt/linux.git

F:	arch/unicore32/



UNIFDEF

arch/unicore32/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ config ARCH_HAS_ILOG2_U32 
config ARCH_HAS_ILOG2_U64

	bool



config ARCH_HAS_CPUFREQ

	bool



config GENERIC_HWEIGHT

	def_bool y
@@ -87,7 +84,6 @@ config ARCH_PUV3 
	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ



# CONFIGs for ARCH_PUV3
@@ -198,9 +194,7 @@ menu "Power management options" 


source "kernel/power/Kconfig"



if ARCH_HAS_CPUFREQ

source "drivers/cpufreq/Kconfig"

endif



config ARCH_SUSPEND_POSSIBLE

	def_bool y if !ARCH_FPGA

arch/unicore32/include/asm/io.h

+27 −0
Original line number Diff line number Diff line
@@ -39,10 +39,37 @@ extern void __uc32_iounmap(volatile void __iomem *addr); 
#define ioremap_nocache(cookie, size)	__uc32_ioremap(cookie, size)

#define iounmap(cookie)			__uc32_iounmap(cookie)



#define readb_relaxed readb

#define readw_relaxed readw

#define readl_relaxed readl



#define HAVE_ARCH_PIO_SIZE

#define PIO_OFFSET		(unsigned int)(PCI_IOBASE)

#define PIO_MASK		(unsigned int)(IO_SPACE_LIMIT)

#define PIO_RESERVED		(PIO_OFFSET + PIO_MASK + 1)



#ifdef CONFIG_STRICT_DEVMEM



#include <linux/ioport.h>

#include <linux/mm.h>



/*

 * devmem_is_allowed() checks to see if /dev/mem access to a certain

 * address is valid. The argument is a physical page number.

 * We mimic x86 here by disallowing access to system RAM as well as

 * device-exclusive MMIO regions. This effectively disable read()/write()

 * on /dev/mem.

 */

static inline int devmem_is_allowed(unsigned long pfn)

{

	if (iomem_is_exclusive(pfn << PAGE_SHIFT))

		return 0;

	if (!page_is_ram(pfn))

		return 1;

	return 0;

}



#endif /* CONFIG_STRICT_DEVMEM */



#endif	/* __KERNEL__ */

#endif	/* __UNICORE_IO_H__ */

arch/unicore32/include/asm/pgtable.h

+5 −5
Original line number Diff line number Diff line
@@ -87,16 +87,16 @@ extern pgprot_t pgprot_kernel; 


#define PAGE_NONE		pgprot_user

#define PAGE_SHARED		__pgprot(pgprot_val(pgprot_user | PTE_READ \

								| PTE_WRITE)

								| PTE_WRITE))

#define PAGE_SHARED_EXEC	__pgprot(pgprot_val(pgprot_user | PTE_READ \

								| PTE_WRITE \

								| PTE_EXEC)

								| PTE_EXEC))

#define PAGE_COPY		__pgprot(pgprot_val(pgprot_user | PTE_READ)

#define PAGE_COPY_EXEC		__pgprot(pgprot_val(pgprot_user | PTE_READ \

								| PTE_EXEC)

#define PAGE_READONLY		__pgprot(pgprot_val(pgprot_user | PTE_READ)

								| PTE_EXEC))

#define PAGE_READONLY		__pgprot(pgprot_val(pgprot_user | PTE_READ))

#define PAGE_READONLY_EXEC	__pgprot(pgprot_val(pgprot_user | PTE_READ \

								| PTE_EXEC)

								| PTE_EXEC))

#define PAGE_KERNEL		pgprot_kernel

#define PAGE_KERNEL_EXEC	__pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))

arch/unicore32/include/asm/ptrace.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static inline int valid_user_regs(struct pt_regs *regs) 


#define instruction_pointer(regs)	((regs)->UCreg_pc)

#define user_stack_pointer(regs)	((regs)->UCreg_sp)

#define profile_pc(regs)		instruction_pointer(regs)



#endif /* __ASSEMBLY__ */

#endif