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

Commit 6108209c authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'for-linus' into work.misc

parents a1c6f057 a7f61e89

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ Optional properties: 


Slave Properties:

Required properties:

- phy_id		: Specifies slave phy id

- phy-mode		: See ethernet.txt file in the same directory



Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  or the sub-node fixed-link can be specified

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Blurry Fish Butt



# *DOCUMENTATION*

arch/arm/kernel/sys_oabi-compat.c

+37 −36
Original line number Diff line number Diff line
@@ -193,22 +193,14 @@ struct oabi_flock64 { 
	pid_t	l_pid;

} __attribute__ ((packed,aligned(4)));



asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd,

static long do_locks(unsigned int fd, unsigned int cmd,

				 unsigned long arg)

{

	struct oabi_flock64 user;

	struct flock64 kernel;

	mm_segment_t fs = USER_DS; /* initialized to kill a warning */

	unsigned long local_arg = arg;

	int ret;

	struct oabi_flock64 user;

	mm_segment_t fs;

	long ret;



	switch (cmd) {

	case F_OFD_GETLK:

	case F_OFD_SETLK:

	case F_OFD_SETLKW:

	case F_GETLK64:

	case F_SETLK64:

	case F_SETLKW64:

	if (copy_from_user(&user, (struct oabi_flock64 __user *)arg,

			   sizeof(user)))

		return -EFAULT;
@@ -217,16 +209,13 @@ asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd, 
	kernel.l_start	= user.l_start;

	kernel.l_len	= user.l_len;

	kernel.l_pid	= user.l_pid;

		local_arg = (unsigned long)&kernel;



	fs = get_fs();

	set_fs(KERNEL_DS);

	}



	ret = sys_fcntl64(fd, cmd, local_arg);

	ret = sys_fcntl64(fd, cmd, (unsigned long)&kernel);

	set_fs(fs);



	switch (cmd) {

	case F_GETLK64:

		if (!ret) {

	if (!ret && (cmd == F_GETLK64 || cmd == F_OFD_GETLK)) {

		user.l_type	= kernel.l_type;

		user.l_whence	= kernel.l_whence;

		user.l_start	= kernel.l_start;
@@ -236,12 +225,24 @@ asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd, 
				 &user, sizeof(user)))

			ret = -EFAULT;

	}

	return ret;

}



asmlinkage long sys_oabi_fcntl64(unsigned int fd, unsigned int cmd,

				 unsigned long arg)

{

	switch (cmd) {

	case F_OFD_GETLK:

	case F_OFD_SETLK:

	case F_OFD_SETLKW:

	case F_GETLK64:

	case F_SETLK64:

	case F_SETLKW64:

		set_fs(fs);

	}

		return do_locks(fd, cmd, arg);



	return ret;

	default:

		return sys_fcntl64(fd, cmd, arg);

	}

}



struct oabi_epoll_event {

arch/m32r/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ generic-y += clkdev.h 
generic-y += cputime.h

generic-y += exec.h

generic-y += irq_work.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += module.h

arch/m32r/include/asm/io.h

+9 −1
Original line number Diff line number Diff line
@@ -168,13 +168,21 @@ static inline void _writel(unsigned long l, unsigned long addr) 
#define writew_relaxed writew

#define writel_relaxed writel



#define ioread8 read

#define ioread8 readb

#define ioread16 readw

#define ioread32 readl

#define iowrite8 writeb

#define iowrite16 writew

#define iowrite32 writel



#define ioread8_rep(p, dst, count) insb((unsigned long)(p), (dst), (count))

#define ioread16_rep(p, dst, count) insw((unsigned long)(p), (dst), (count))

#define ioread32_rep(p, dst, count) insl((unsigned long)(p), (dst), (count))



#define iowrite8_rep(p, src, count) outsb((unsigned long)(p), (src), (count))

#define iowrite16_rep(p, src, count) outsw((unsigned long)(p), (src), (count))

#define iowrite32_rep(p, src, count) outsl((unsigned long)(p), (src), (count))



#define ioread16be(addr)	be16_to_cpu(readw(addr))

#define ioread32be(addr)	be32_to_cpu(readl(addr))

#define iowrite16be(v, addr)	writew(cpu_to_be16(v), (addr))