summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 11:44:08 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 13:02:40 +0200
commitc1c8f558749cbf2a7ed16b6ae6e19a4238b6fa33 (patch)
treeb329939fdc5347532cb44261892914493d27e64e /arch/cris
parent72e08db187cbbfca00583c28b64ae81a35f4a287 (diff)
downloadlinux-3.10-c1c8f558749cbf2a7ed16b6ae6e19a4238b6fa33.tar.gz
linux-3.10-c1c8f558749cbf2a7ed16b6ae6e19a4238b6fa33.tar.bz2
linux-3.10-c1c8f558749cbf2a7ed16b6ae6e19a4238b6fa33.zip
CRIS: Return something from profile write
Even if it doesn't matter, we should return something. Also, clean up some formatting. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/kernel/profile.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c
index b917549a7d9..195ec5fa0dd 100644
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
@@ -9,12 +9,11 @@
#define SAMPLE_BUFFER_SIZE 8192
-static char* sample_buffer;
-static char* sample_buffer_pos;
+static char *sample_buffer;
+static char *sample_buffer_pos;
static int prof_running = 0;
-void
-cris_profile_sample(struct pt_regs* regs)
+void cris_profile_sample(struct pt_regs *regs)
{
if (!prof_running)
return;
@@ -24,7 +23,7 @@ cris_profile_sample(struct pt_regs* regs)
else
*(unsigned int*)sample_buffer_pos = 0;
- *(unsigned int*)(sample_buffer_pos + 4) = instruction_pointer(regs);
+ *(unsigned int *)(sample_buffer_pos + 4) = instruction_pointer(regs);
sample_buffer_pos += 8;
if (sample_buffer_pos == sample_buffer + SAMPLE_BUFFER_SIZE)
@@ -54,6 +53,7 @@ write_cris_profile(struct file *file, const char __user *buf,
{
sample_buffer_pos = sample_buffer;
memset(sample_buffer, 0, SAMPLE_BUFFER_SIZE);
+ return count < SAMPLE_BUFFER_SIZE ? count : SAMPLE_BUFFER_SIZE;
}
static const struct file_operations cris_proc_profile_operations = {
@@ -61,8 +61,7 @@ static const struct file_operations cris_proc_profile_operations = {
.write = write_cris_profile,
};
-static int
-__init init_cris_profile(void)
+static int __init init_cris_profile(void)
{
struct proc_dir_entry *entry;
@@ -82,5 +81,5 @@ __init init_cris_profile(void)
return 0;
}
-
__initcall(init_cris_profile);
+