Merge branch 'work.ipc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull ipc compat cleanup and 64-bit time_t from Al Viro: "IPC copyin/copyout sanitizing, including 64bit time_t work from Deepa Dinamani" * 'work.ipc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: utimes: Make utimes y2038 safe ipc: shm: Make shmid_kernel timestamps y2038 safe ipc: sem: Make sem_array timestamps y2038 safe ipc: msg: Make msg_queue timestamps y2038 safe ipc: mqueue: Replace timespec with timespec64 ipc: Make sys_semtimedop() y2038 safe get rid of SYSVIPC_COMPAT on ia64 semtimedop(): move compat to native shmat(2): move compat to native msgrcv(2), msgsnd(2): move compat to native ipc(2): move compat to native ipc: make use of compat ipc_perm helpers semctl(): move compat to native semctl(): separate all layout-dependent copyin/copyout msgctl(): move compat to native msgctl(): split the actual work from copyin/copyout ipc: move compat shmctl to native shmctl: split the work from copyin/copyout

Linus Torvalds committed 9 years ago

Commit cc73fee2 parents e7cdb60 aaed2dd19 files · +1044 −1195Browse files

Showing the changes to init (1 of 19 files). Show all

Unified · Split

init/initramfs.c+1−1

@@ -110,7 +110,7 @@ static void __init free_hash(void) · 109 unmodified lines
110	110
111	111	static long __init do_utime(char *filename, time_t mtime)
112	112	{
113		− struct timespec t[2];
	113	+ struct timespec64 t[2];
114	114
115	115	t[0].tv_sec = mtime;
116	116	t[0].tv_nsec = 0;