Commit 40e38d30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Alchemy:  Fix PCI-memory access
  [MIPS] Fix N32 SysV IPC routines
  [MIPS] PNX8550: Fix system timer initialization
parents c70a1ce8 8a93c496

arch/mips/au1000/common/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -39,15 +39,15 @@ 


/* TBD */

static struct resource pci_io_resource = {

	.start	= PCI_IO_START,

	.end	= PCI_IO_END,

	.start	= (resource_size_t)PCI_IO_START,

	.end	= (resource_size_t)PCI_IO_END,

	.name	= "PCI IO space",

	.flags	= IORESOURCE_IO

};



static struct resource pci_mem_resource = {

	.start	= PCI_MEM_START,

	.end	= PCI_MEM_END,

	.start	= (resource_size_t)PCI_MEM_START,

	.end	= (resource_size_t)PCI_MEM_END,

	.name	= "PCI memory space",

	.flags	= IORESOURCE_MEM

};

arch/mips/kernel/linux32.c

+14 −2
Original line number Diff line number Diff line
@@ -440,14 +440,26 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth) 
}



#ifdef CONFIG_MIPS32_N32

asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, union semun arg)

asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg)

{

	/* compat_sys_semctl expects a pointer to union semun */

	u32 __user *uptr = compat_alloc_user_space(sizeof(u32));

	if (put_user(ptr_to_compat(arg.__pad), uptr))

	if (put_user(arg, uptr))

		return -EFAULT;

	return compat_sys_semctl(semid, semnum, cmd, uptr);

}



asmlinkage long sysn32_msgsnd(int msqid, u32 msgp, unsigned msgsz, int msgflg)

{

	return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));

}



asmlinkage long sysn32_msgrcv(int msqid, u32 msgp, size_t msgsz, int msgtyp,

			      int msgflg)

{

	return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,

				 compat_ptr(msgp));

}

#endif



struct sysctl_args32

arch/mips/kernel/scall64-n32.S

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ EXPORT(sysn32_call_table) 
	PTR	sysn32_semctl

	PTR	sys_shmdt			/* 6065 */

	PTR	sys_msgget

	PTR	compat_sys_msgsnd

	PTR	compat_sys_msgrcv

	PTR	sysn32_msgsnd

	PTR	sysn32_msgrcv

	PTR	compat_sys_msgctl

	PTR	compat_sys_fcntl		/* 6070 */

	PTR	sys_flock

arch/mips/philips/pnx8550/common/time.c

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ void pnx8550_time_init(void) 
	 */

	mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));

	cpj = (mips_hpt_frequency + HZ / 2) / HZ;

	write_c0_count(0);

	timer_ack();



	/* Setup Timer 2 */