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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:

 - A few y2038 fixes which missed the merge window while dependencies
   in NFS were being sorted out.

 - A bunch of fixes. Some minor, some not.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: use tabs for SAFESETID
  lib/stackdepot.c: fix global out-of-bounds in stack_slabs
  mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM
  mm/vmscan.c: don't round up scan size for online memory cgroup
  lib/string.c: update match_string() doc-strings with correct behavior
  mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps()
  mm/swapfile.c: fix a comment in sys_swapon()
  scripts/get_maintainer.pl: deprioritize old Fixes: addresses
  get_maintainer: remove uses of P: for maintainer name
  selftests/vm: add missed tests in run_vmtests
  include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
  Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()"
  y2038: hide timeval/timespec/itimerval/itimerspec types
  y2038: remove unused time32 interfaces
  y2038: remove ktime to/from timespec/timeval conversion
parents 63fb9623 bb8d00ff

include/linux/compat.h

+0 −29
Original line number Diff line number Diff line
@@ -248,15 +248,6 @@ typedef struct compat_siginfo { 
	} _sifields;

} compat_siginfo_t;



/*

 * These functions operate on 32- or 64-bit specs depending on

 * COMPAT_USE_64BIT_TIME, hence the void user pointer arguments.

 */

extern int compat_get_timespec(struct timespec *, const void __user *);

extern int compat_put_timespec(const struct timespec *, void __user *);

extern int compat_get_timeval(struct timeval *, const void __user *);

extern int compat_put_timeval(const struct timeval *, void __user *);



struct compat_iovec {

	compat_uptr_t	iov_base;

	compat_size_t	iov_len;
@@ -416,26 +407,6 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, const kernel_siginf 
int get_compat_sigevent(struct sigevent *event,

		const struct compat_sigevent __user *u_event);



static inline int old_timeval32_compare(struct old_timeval32 *lhs,

					struct old_timeval32 *rhs)

{

	if (lhs->tv_sec < rhs->tv_sec)

		return -1;

	if (lhs->tv_sec > rhs->tv_sec)

		return 1;

	return lhs->tv_usec - rhs->tv_usec;

}



static inline int old_timespec32_compare(struct old_timespec32 *lhs,

					struct old_timespec32 *rhs)

{

	if (lhs->tv_sec < rhs->tv_sec)

		return -1;

	if (lhs->tv_sec > rhs->tv_sec)

		return 1;

	return lhs->tv_nsec - rhs->tv_nsec;

}



extern int get_compat_sigset(sigset_t *set, const compat_sigset_t __user *compat);



/*

include/linux/ktime.h

+0 −37
Original line number Diff line number Diff line
@@ -66,33 +66,15 @@ static inline ktime_t ktime_set(const s64 secs, const unsigned long nsecs) 
 */

#define ktime_sub_ns(kt, nsval)		((kt) - (nsval))



/* convert a timespec to ktime_t format: */

static inline ktime_t timespec_to_ktime(struct timespec ts)

{

	return ktime_set(ts.tv_sec, ts.tv_nsec);

}



/* convert a timespec64 to ktime_t format: */

static inline ktime_t timespec64_to_ktime(struct timespec64 ts)

{

	return ktime_set(ts.tv_sec, ts.tv_nsec);

}



/* convert a timeval to ktime_t format: */

static inline ktime_t timeval_to_ktime(struct timeval tv)

{

	return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC);

}



/* Map the ktime_t to timespec conversion to ns_to_timespec function */

#define ktime_to_timespec(kt)		ns_to_timespec((kt))



/* Map the ktime_t to timespec conversion to ns_to_timespec function */

#define ktime_to_timespec64(kt)		ns_to_timespec64((kt))



/* Map the ktime_t to timeval conversion to ns_to_timeval function */

#define ktime_to_timeval(kt)		ns_to_timeval((kt))



/* Convert ktime_t to nanoseconds */

static inline s64 ktime_to_ns(const ktime_t kt)

{
@@ -215,25 +197,6 @@ static inline ktime_t ktime_sub_ms(const ktime_t kt, const u64 msec) 


extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);



/**

 * ktime_to_timespec_cond - convert a ktime_t variable to timespec

 *			    format only if the variable contains data

 * @kt:		the ktime_t variable to convert

 * @ts:		the timespec variable to store the result in

 *

 * Return: %true if there was a successful conversion, %false if kt was 0.

 */

static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,

						       struct timespec *ts)

{

	if (kt) {

		*ts = ktime_to_timespec(kt);

		return true;

	} else {

		return false;

	}

}



/**

 * ktime_to_timespec64_cond - convert a ktime_t variable to timespec64

 *			    format only if the variable contains data

include/linux/time32.h

+1 −153
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#include <linux/time64.h>

#include <linux/timex.h>



#define TIME_T_MAX	(__kernel_old_time_t)((1UL << ((sizeof(__kernel_old_time_t) << 3) - 1)) - 1)



typedef s32		old_time32_t;



struct old_timespec32 {
@@ -73,162 +71,12 @@ struct __kernel_timex; 
int get_old_timex32(struct __kernel_timex *, const struct old_timex32 __user *);

int put_old_timex32(struct old_timex32 __user *, const struct __kernel_timex *);



#if __BITS_PER_LONG == 64



/* timespec64 is defined as timespec here */

static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)

{

	return *(const struct timespec *)&ts64;

}



static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)

{

	return *(const struct timespec64 *)&ts;

}



#else

static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)

{

	struct timespec ret;



	ret.tv_sec = (time_t)ts64.tv_sec;

	ret.tv_nsec = ts64.tv_nsec;

	return ret;

}



static inline struct timespec64 timespec_to_timespec64(const struct timespec ts)

{

	struct timespec64 ret;



	ret.tv_sec = ts.tv_sec;

	ret.tv_nsec = ts.tv_nsec;

	return ret;

}

#endif



static inline int timespec_equal(const struct timespec *a,

				 const struct timespec *b)

{

	return (a->tv_sec == b->tv_sec) && (a->tv_nsec == b->tv_nsec);

}



/*

 * lhs < rhs:  return <0

 * lhs == rhs: return 0

 * lhs > rhs:  return >0

 */

static inline int timespec_compare(const struct timespec *lhs, const struct timespec *rhs)

{

	if (lhs->tv_sec < rhs->tv_sec)

		return -1;

	if (lhs->tv_sec > rhs->tv_sec)

		return 1;

	return lhs->tv_nsec - rhs->tv_nsec;

}



/*

 * Returns true if the timespec is norm, false if denorm:

 */

static inline bool timespec_valid(const struct timespec *ts)

{

	/* Dates before 1970 are bogus */

	if (ts->tv_sec < 0)

		return false;

	/* Can't have more nanoseconds then a second */

	if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC)

		return false;

	return true;

}



/**

 * timespec_to_ns - Convert timespec to nanoseconds

 * @ts:		pointer to the timespec variable to be converted

 *

 * Returns the scalar nanosecond representation of the timespec

 * parameter.

 */

static inline s64 timespec_to_ns(const struct timespec *ts)

{

	return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;

}



/**

 * ns_to_timespec - Convert nanoseconds to timespec

 * @nsec:	the nanoseconds value to be converted

 *

 * Returns the timespec representation of the nsec parameter.

 */

extern struct timespec ns_to_timespec(const s64 nsec);



/**

 * timespec_add_ns - Adds nanoseconds to a timespec

 * @a:		pointer to timespec to be incremented

 * @ns:		unsigned nanoseconds value to be added

 *

 * This must always be inlined because its used from the x86-64 vdso,

 * which cannot call other kernel functions.

 */

static __always_inline void timespec_add_ns(struct timespec *a, u64 ns)

{

	a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);

	a->tv_nsec = ns;

}



static inline unsigned long mktime(const unsigned int year,

			const unsigned int mon, const unsigned int day,

			const unsigned int hour, const unsigned int min,

			const unsigned int sec)

{

	return mktime64(year, mon, day, hour, min, sec);

}



static inline bool timeval_valid(const struct timeval *tv)

{

	/* Dates before 1970 are bogus */

	if (tv->tv_sec < 0)

		return false;



	/* Can't have more microseconds then a second */

	if (tv->tv_usec < 0 || tv->tv_usec >= USEC_PER_SEC)

		return false;



	return true;

}



/**

 * timeval_to_ns - Convert timeval to nanoseconds

 * @ts:		pointer to the timeval variable to be converted

 *

 * Returns the scalar nanosecond representation of the timeval

 * parameter.

 */

static inline s64 timeval_to_ns(const struct timeval *tv)

{

	return ((s64) tv->tv_sec * NSEC_PER_SEC) +

		tv->tv_usec * NSEC_PER_USEC;

}



/**

 * ns_to_timeval - Convert nanoseconds to timeval

 * ns_to_kernel_old_timeval - Convert nanoseconds to timeval

 * @nsec:	the nanoseconds value to be converted

 *

 * Returns the timeval representation of the nsec parameter.

 */

extern struct timeval ns_to_timeval(const s64 nsec);

extern struct __kernel_old_timeval ns_to_kernel_old_timeval(s64 nsec);



/*

 * Old names for the 32-bit time_t interfaces, these will be removed

 * when everything uses the new names.

 */

#define compat_time_t		old_time32_t

#define compat_timeval		old_timeval32

#define compat_timespec		old_timespec32

#define compat_itimerspec	old_itimerspec32

#define ns_to_compat_timeval	ns_to_old_timeval32

#define get_compat_itimerspec64	get_old_itimerspec32

#define put_compat_itimerspec64	put_old_itimerspec32

#define compat_get_timespec64	get_old_timespec32

#define compat_put_timespec64	put_old_timespec32



#endif

include/linux/timekeeping32.h

+0 −32
Original line number Diff line number Diff line
@@ -11,36 +11,4 @@ static inline unsigned long get_seconds(void) 
	return ktime_get_real_seconds();

}



static inline void getnstimeofday(struct timespec *ts)

{

	struct timespec64 ts64;



	ktime_get_real_ts64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



static inline void ktime_get_ts(struct timespec *ts)

{

	struct timespec64 ts64;



	ktime_get_ts64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



static inline void getrawmonotonic(struct timespec *ts)

{

	struct timespec64 ts64;



	ktime_get_raw_ts64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



static inline void getboottime(struct timespec *ts)

{

	struct timespec64 ts64;



	getboottime64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



#endif

include/linux/types.h

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ typedef __kernel_ssize_t ssize_t; 
typedef __kernel_ptrdiff_t	ptrdiff_t;

#endif



#ifndef _TIME_T

#define _TIME_T

typedef __kernel_old_time_t	time_t;

#endif



#ifndef _CLOCK_T

#define _CLOCK_T

typedef __kernel_clock_t	clock_t;

CRA Git | Maintained and supported by SUSTech CRA and CCSE