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

Commit 308efab5 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

vt: Fix use of "new" in a struct field 



As this struct is exposed to user space and the API was added for this
release it's a bit of a pain for the C++ world and we still have time to
fix it. Rename the fields before we end up with that pain in an actual
release.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Reported-by: Olivier Goffart
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5854d9c8

drivers/char/vt_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new) 
		ve->event.event = event;

		/* kernel view is consoles 0..n-1, user space view is

		   console 1..n with 0 meaning current, so we must bias */

		ve->event.old = old + 1;

		ve->event.new = new + 1;

		ve->event.oldev = old + 1;

		ve->event.newev = new + 1;

		wake = 1;

		ve->done = 1;

	}
@@ -186,7 +186,7 @@ int vt_waitactive(int n) 
		vt_event_wait(&vw);

		if (vw.done == 0)

			return -EINTR;

	} while (vw.event.new != n);

	} while (vw.event.newev != n);

	return 0;

}

include/linux/vt.h

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ struct vt_event { 
#define VT_EVENT_UNBLANK	0x0004	/* Screen unblank */

#define VT_EVENT_RESIZE		0x0008	/* Resize display */

#define VT_MAX_EVENT		0x000F

	unsigned int old;		/* Old console */

	unsigned int new;		/* New console (if changing) */

	unsigned int oldev;		/* Old console */

	unsigned int newev;		/* New console (if changing) */

	unsigned int pad[4];		/* Padding for expansion */

};