Merge branch 'akpm' (Fixes from Andrew) (ce6d841e) · Commits · 戴 / test

arch/h8300/include/asm/cache.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,8 @@
		#define __ARCH_H8300_CACHE_H

		/* bytes per L1 cache line */
		#define L1_CACHE_BYTES 4
		#define L1_CACHE_SHIFT 2
		#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)

		/* m68k-elf-gcc 2.95.2 doesn't like these */

fs/eventpoll.c

+3 −35

Original line number	Diff line number	Diff line
		@@ -346,7 +346,7 @@ static inline struct epitem ep_item_from_epqueue(poll_table p)
		/* Tells if the epoll_ctl(2) operation needs an event copy from userspace */
		static inline int ep_op_has_event(int op)
		{
		return op == EPOLL_CTL_ADD \|\| op == EPOLL_CTL_MOD;
		return op != EPOLL_CTL_DEL;
		}

		/* Initialize the poll safe wake up structure */
		@@ -676,34 +676,6 @@ static int ep_remove(struct eventpoll ep, struct epitem epi)
		return 0;
		}

		/*
		* Disables a "struct epitem" in the eventpoll set. Returns -EBUSY if the item
		* had no event flags set, indicating that another thread may be currently
		* handling that item's events (in the case that EPOLLONESHOT was being
		* used). Otherwise a zero result indicates that the item has been disabled
		* from receiving events. A disabled item may be re-enabled via
		* EPOLL_CTL_MOD. Must be called with "mtx" held.
		*/
		static int ep_disable(struct eventpoll ep, struct epitem epi)
		{
		int result = 0;
		unsigned long flags;

		spin_lock_irqsave(&ep->lock, flags);
		if (epi->event.events & ~EP_PRIVATE_BITS) {
		if (ep_is_linked(&epi->rdllink))
		list_del_init(&epi->rdllink);
		/* Ensure ep_poll_callback will not add epi back onto ready
		list: */
		epi->event.events &= EP_PRIVATE_BITS;
		}
		else
		result = -EBUSY;
		spin_unlock_irqrestore(&ep->lock, flags);

		return result;
		}

		static void ep_free(struct eventpoll *ep)
		{
		struct rb_node *rbp;
		@@ -1048,6 +1020,8 @@ static void ep_rbtree_insert(struct eventpoll ep, struct epitem epi)
		rb_insert_color(&epi->rbn, &ep->rbr);
		}



		#define PATH_ARR_SIZE 5
		/*
		* These are the number paths of length 1 to 5, that we are allowing to emanate
		@@ -1813,12 +1787,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
		} else
		error = -ENOENT;
		break;
		case EPOLL_CTL_DISABLE:
		if (epi)
		error = ep_disable(ep, epi);
		else
		error = -ENOENT;
		break;
		}
		mutex_unlock(&ep->mtx);

fs/notify/fanotify/fanotify.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ static bool should_merge(struct fsnotify_event old, struct fsnotify_event new)
		if ((old->path.mnt == new->path.mnt) &&
		(old->path.dentry == new->path.dentry))
		return true;
		break;
		case (FSNOTIFY_EVENT_NONE):
		return true;
		default:

include/uapi/linux/eventpoll.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#define EPOLL_CTL_ADD 1
		#define EPOLL_CTL_DEL 2
		#define EPOLL_CTL_MOD 3
		#define EPOLL_CTL_DISABLE 4

		/*
		* Request the handling of system wakeup events so as to prevent system suspends

mm/vmscan.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3017,6 +3017,8 @@ static int kswapd(void *p)
		&balanced_classzone_idx);
		}
		}

		current->reclaim_state = NULL;
		return 0;
		}

Admin message