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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: add sys_recvmmsg to unistd.h
  asm-generic: add sys_accept4 to unistd.h
  asm-generic/gpio.h: add some forward decls of the device struct
  asm-generic: Fix typo in asm-generic/unistd.h.
  lib/checksum: fix one more thinko
  lib/checksum.c: make do_csum optional
  lib/checksum.c: use 32-bit arithmetic consistently
parents 3070f27d 3d770387

include/asm-generic/gpio.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static inline int gpio_is_valid(int number) 
	return ((unsigned)number) < ARCH_NR_GPIOS;

}



struct device;

struct seq_file;

struct module;
@@ -181,6 +182,8 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value) 


#ifndef CONFIG_GPIO_SYSFS



struct device;



/* sysfs support is only available with gpiolib, where it's optional */



static inline int gpio_export(unsigned gpio, bool direction_may_change)

include/asm-generic/unistd.h

+7 −3
Original line number Diff line number Diff line
@@ -622,9 +622,13 @@ __SYSCALL(__NR_move_pages, sys_move_pages) 
__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)

#define __NR_perf_event_open 241

__SYSCALL(__NR_perf_event_open, sys_perf_event_open)

#define __NR_accept4 242

__SYSCALL(__NR_accept4, sys_accept4)

#define __NR_recvmmsg 243

__SYSCALL(__NR_recvmmsg, sys_recvmmsg)



#undef __NR_syscalls

#define __NR_syscalls 242

#define __NR_syscalls 244



/*

 * All syscalls below here should go away really,
@@ -802,7 +806,7 @@ __SYSCALL(__NR_fork, sys_ni_syscall) 
#define __NR_statfs __NR3264_statfs

#define __NR_fstatfs __NR3264_fstatfs

#define __NR_truncate __NR3264_truncate

#define __NR_ftruncate __NR3264_truncate

#define __NR_ftruncate __NR3264_ftruncate

#define __NR_lseek __NR3264_lseek

#define __NR_sendfile __NR3264_sendfile

#define __NR_newfstatat __NR3264_fstatat
@@ -818,7 +822,7 @@ __SYSCALL(__NR_fork, sys_ni_syscall) 
#define __NR_statfs64 __NR3264_statfs

#define __NR_fstatfs64 __NR3264_fstatfs

#define __NR_truncate64 __NR3264_truncate

#define __NR_ftruncate64 __NR3264_truncate

#define __NR_ftruncate64 __NR3264_ftruncate

#define __NR_llseek __NR3264_lseek

#define __NR_sendfile64 __NR3264_sendfile

#define __NR_fstatat64 __NR3264_fstatat

lib/checksum.c

+8 −6
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 


#include <asm/byteorder.h>



static inline unsigned short from32to16(unsigned long x)

#ifndef do_csum

static inline unsigned short from32to16(unsigned int x)

{

	/* add up 16-bit and 16-bit for 16+c bit */

	x = (x & 0xffff) + (x >> 16);
@@ -49,16 +50,16 @@ static inline unsigned short from32to16(unsigned long x) 
static unsigned int do_csum(const unsigned char *buff, int len)

{

	int odd, count;

	unsigned long result = 0;

	unsigned int result = 0;



	if (len <= 0)

		goto out;

	odd = 1 & (unsigned long) buff;

	if (odd) {

#ifdef __LITTLE_ENDIAN

		result = *buff;

#else

		result += (*buff << 8);

#else

		result = *buff;

#endif

		len--;

		buff++;
@@ -73,9 +74,9 @@ static unsigned int do_csum(const unsigned char *buff, int len) 
		}

		count >>= 1;		/* nr of 32-bit words.. */

		if (count) {

			unsigned long carry = 0;

			unsigned int carry = 0;

			do {

				unsigned long w = *(unsigned int *) buff;

				unsigned int w = *(unsigned int *) buff;

				count--;

				buff += 4;

				result += carry;
@@ -102,6 +103,7 @@ static unsigned int do_csum(const unsigned char *buff, int len) 
out:

	return result;

}

#endif



/*

 *	This is a version of ip_compute_csum() optimized for IP headers,

CRA Git | Maintained and supported by SUSTech CRA and CCSE