Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 86bef156cf0a..82c5085559c6 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -1975,8 +1975,7 @@ int ntfs_read_inode_mount(struct inode *vi)
                                 goto em_put_err_out;
                         next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +
                                         le16_to_cpu(al_entry->length));
-                        if (le32_to_cpu(al_entry->type) >
-                                        const_le32_to_cpu(AT_DATA))
+                        if (le32_to_cpu(al_entry->type) > le32_to_cpu(AT_DATA))
                                 goto em_put_err_out;
                         if (AT_DATA != al_entry->type)
                                 continue;