From: Sebastian Reichel <sre@kernel.org>
To: Sebastian Reichel <sre@kernel.org>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>,
Kai Vehmanen <kvcontact@nosignal.fi>, Pavel Machek <pavel@ucw.cz>,
Pali Rohar <pali.rohar@gmail.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>,
linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-api@vger.kernel.org
Subject: [PATCH 4/9] HSI: cmt_speech: Fix build for 4.0 kernel
Date: Mon, 2 Mar 2015 05:38:54 +0100 [thread overview]
Message-ID: <1425271139-24715-5-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1425271139-24715-1-git-send-email-sre@kernel.org>
Fix building of the old out-of-tree code.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
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 <linux/sched.h>
#include <linux/ioctl.h>
#include <linux/uaccess.h>
-#include <linux/pm_qos_params.h>
+#include <linux/pm_qos.h>
#include <linux/hsi/hsi.h>
-#include <linux/hsi/ssip_slave.h>
+#include <linux/hsi/ssi_protocol.h>
#include <linux/cs-protocol.h>
#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
next prev parent reply other threads:[~2015-03-02 4:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-02 4:38 [PATCH 0/9] N900 Modem Speech Support Sebastian Reichel
2015-03-02 4:38 ` [PATCH 1/9] HSI: cmt_speech: Add cmt-speech driver Sebastian Reichel
2015-03-02 10:22 ` Oliver Neukum
2015-03-02 15:26 ` Sebastian Reichel
2015-03-02 10:29 ` Oliver Neukum
2015-03-02 20:56 ` Aaro Koskinen
2015-03-02 4:38 ` [PATCH 2/9] HSI: cmt_speech: Avoid GFP_ATOMIC in cs_char_open Sebastian Reichel
2015-03-02 4:38 ` [PATCH 3/9] HSI: cmt_speech: Return error if HSI port not configured Sebastian Reichel
2015-03-02 4:38 ` Sebastian Reichel [this message]
2015-03-02 4:38 ` [PATCH 5/9] HSI: cmt_speech: Cleanup initialisation Sebastian Reichel
2015-03-02 4:38 ` [PATCH 6/9] HSI: cmt_speech: Rename driver to cmt-speech Sebastian Reichel
2015-03-02 4:38 ` [PATCH 7/9] HSI: cmt_speech: Move cs-protocol.h to include/uapi/linux/hsi Sebastian Reichel
2015-03-02 4:38 ` [PATCH 8/9] HSI: cmt_speech: Remove hardcoded channel numbers Sebastian Reichel
2015-03-02 4:38 ` [PATCH 9/9] HSI: nokia-modem: Add cmt_speech support Sebastian Reichel
2015-03-02 19:05 ` [PATCH 0/9] N900 Modem Speech Support Pali Rohár
2015-03-02 20:51 ` Sebastian Reichel
2015-03-03 17:46 ` Pali Rohár
2015-03-03 13:33 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425271139-24715-5-git-send-email-sre@kernel.org \
--to=sre@kernel.org \
--cc=aaro.koskinen@iki.fi \
--cc=ivo.g.dimitrov.75@gmail.com \
--cc=kvcontact@nosignal.fi \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=pavel@ucw.cz \
--cc=peter.ujfalusi@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).