Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (f1877fb2) · Commits · 戴 / test

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix iounmap argument to const volatile. [MIPS] Reserve syscall numbers for kexec_load. [MIPS] Update tb0287_defconfig [MIPS] Update pnx8550-v2pci_defconfig [MIPS] Update pnx8500-jbs_defconfig [MIPS] More vr41xx pt_regs fixups [MIPS] save_context_stack fix [MIPS] Use compat_sys_mount. [MIPS] Fix O32 personality(2) call with 0xffffffff argument. [MIPS] A few more pt_regs fixups. [MIPS] Malta: Fix uninitialized regs pointer. [MIPS] Delete unneeded pt_regs forward declaration. [MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup()

arch/mips/au1000/common/dbdma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -849,7 +849,7 @@ au1xxx_dbdma_chan_free(u32 chanid)
		EXPORT_SYMBOL(au1xxx_dbdma_chan_free);

		static irqreturn_t
		dbdma_interrupt(int irq, void dev_id, struct pt_regs regs)
		dbdma_interrupt(int irq, void *dev_id)
		{
		u32 intstat;
		u32 chan_index;

arch/mips/configs/pnx8550-jbs_defconfig

+330 −54

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/configs/pnx8550-v2pci_defconfig

+382 −59

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/configs/tb0287_defconfig

+99 −83

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/kernel/linux32.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1055,7 +1055,9 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name)
		asmlinkage int sys32_personality(unsigned long personality)
		{
		int ret;
		if (current->personality == PER_LINUX32 && personality == PER_LINUX)
		personality &= 0xffffffff;
		if (personality(current->personality) == PER_LINUX32 &&
		personality == PER_LINUX)
		personality = PER_LINUX32;
		ret = sys_personality(personality);
		if (ret == PER_LINUX32)

Admin message