Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3e095a authored by Erik Jacobson's avatar Erik Jacobson Committed by Linus Torvalds
Browse files

[PATCH] connector: some fixes for ia64 unaligned access errors 



On ia64, the various functions that make up cn_proc.c cause kernel
unaligned access errors.

If you are using these, for example, to get notification about all tasks
forking and exiting, you get multiple unaligned access errors per process.

Use put_unaligned() in the appropriate palces to fix this.

Signed-off-by: default avatarErik Jacobson <erikj@sgi.com>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: <stable@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 76395d37

drivers/connector/cn_proc.c

+6 −5
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/init.h>

#include <linux/connector.h>

#include <asm/atomic.h>

#include <asm/unaligned.h>



#include <linux/cn_proc.h>
@@ -60,7 +61,7 @@ void proc_fork_connector(struct task_struct *task) 
	ev = (struct proc_event*)msg->data;

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	ev->timestamp_ns = timespec_to_ns(&ts);

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);

	ev->what = PROC_EVENT_FORK;

	ev->event_data.fork.parent_pid = task->real_parent->pid;

	ev->event_data.fork.parent_tgid = task->real_parent->tgid;
@@ -88,7 +89,7 @@ void proc_exec_connector(struct task_struct *task) 
	ev = (struct proc_event*)msg->data;

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	ev->timestamp_ns = timespec_to_ns(&ts);

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);

	ev->what = PROC_EVENT_EXEC;

	ev->event_data.exec.process_pid = task->pid;

	ev->event_data.exec.process_tgid = task->tgid;
@@ -124,7 +125,7 @@ void proc_id_connector(struct task_struct *task, int which_id) 
	     	return;

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	ev->timestamp_ns = timespec_to_ns(&ts);

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);



	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */
@@ -146,7 +147,7 @@ void proc_exit_connector(struct task_struct *task) 
	ev = (struct proc_event*)msg->data;

	get_seq(&msg->seq, &ev->cpu);

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	ev->timestamp_ns = timespec_to_ns(&ts);

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);

	ev->what = PROC_EVENT_EXIT;

	ev->event_data.exit.process_pid = task->pid;

	ev->event_data.exit.process_tgid = task->tgid;
@@ -181,7 +182,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) 
	ev = (struct proc_event*)msg->data;

	msg->seq = rcvd_seq;

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	ev->timestamp_ns = timespec_to_ns(&ts);

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);

	ev->cpu = -1;

	ev->what = PROC_EVENT_NONE;

	ev->event_data.ack.err = err;