From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/fs/squashfs/squashfs_fs_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/fs/squashfs/squashfs_fs_i.h') diff --git a/kernel/fs/squashfs/squashfs_fs_i.h b/kernel/fs/squashfs/squashfs_fs_i.h index 73588e770..d09fcd6fb 100644 --- a/kernel/fs/squashfs/squashfs_fs_i.h +++ b/kernel/fs/squashfs/squashfs_fs_i.h @@ -49,6 +49,6 @@ struct squashfs_inode_info { static inline struct squashfs_inode_info *squashfs_i(struct inode *inode) { - return list_entry(inode, struct squashfs_inode_info, vfs_inode); + return container_of(inode, struct squashfs_inode_info, vfs_inode); } #endif -- cgit 1.2.3-korg