From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Reichel Subject: [PATCH 4/9] HSI: cmt_speech: Fix build for 4.0 kernel Date: Mon, 2 Mar 2015 05:38:54 +0100 Message-ID: <1425271139-24715-5-git-send-email-sre@kernel.org> References: <1425271139-24715-1-git-send-email-sre@kernel.org> Return-path: In-Reply-To: <1425271139-24715-1-git-send-email-sre@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Sebastian Reichel Cc: Peter Ujfalusi , Kai Vehmanen , Pavel Machek , Pali Rohar , Aaro Koskinen , Ivaylo Dimitrov , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org List-Id: linux-api@vger.kernel.org Fix building of the old out-of-tree code. Signed-off-by: Sebastian Reichel --- drivers/hsi/clients/cmt_speech.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c index 56846c9..6d852ea 100644 --- a/drivers/hsi/clients/cmt_speech.c +++ b/drivers/hsi/clients/cmt_speech.c @@ -34,9 +34,9 @@ #include #include #include -#include +#include #include -#include +#include #include #define CS_MMAP_SIZE PAGE_SIZE @@ -126,7 +126,7 @@ struct cs_hsi_iface { struct hsi_msg *data_tx_msg; wait_queue_head_t datawait; - struct pm_qos_request_list pm_qos_req; + struct pm_qos_request pm_qos_req; spinlock_t lock; }; @@ -1268,7 +1268,7 @@ static int cs_char_mmap(struct file *file, struct vm_area_struct *vma) if (((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) != 1) return -EINVAL; - vma->vm_flags |= VM_RESERVED; + vma->vm_flags |= VM_IO | VM_DONTDUMP | VM_DONTEXPAND; vma->vm_ops = &cs_char_vm_ops; vma->vm_private_data = file->private_data; -- 2.1.4