summaryrefslogtreecommitdiffstats
path: root/include/linux/cn_proc.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
commit9da305eb089c94c535d1790fd2dec16f44c1689f (patch)
treef37f07f148fd7a793233c7f15c0fa9f46212049d /include/linux/cn_proc.h
parentd96212ed87d032d2d830e265aae14038dc1f8ad8 (diff)
parent14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff)
downloadtalos-obmc-linux-9da305eb089c94c535d1790fd2dec16f44c1689f.tar.gz
talos-obmc-linux-9da305eb089c94c535d1790fd2dec16f44c1689f.zip
Merge branch 'master'
Diffstat (limited to 'include/linux/cn_proc.h')
-rw-r--r--include/linux/cn_proc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index c948f678e04e..1417de935057 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -26,6 +26,7 @@
#define CN_PROC_H
#include <linux/types.h>
+#include <linux/time.h>
#include <linux/connector.h>
/*
@@ -65,6 +66,7 @@ struct proc_event {
PROC_EVENT_EXIT = 0x80000000
} what;
__u32 cpu;
+ struct timespec timestamp;
union { /* must be last field of proc_event struct */
struct {
__u32 err;
OpenPOWER on IntegriCloud