summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2008-05-13 22:06:56 -0700
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 22:35:57 +0200
commitaa5e5ceaf52a882a29d9b86531a20733f5116066 (patch)
treeedfa557db13cce863a3c68fbd72bed473f83e1f7
parent74f4e369fc5b52433ad824cef32d3bf1304549be (diff)
downloadop-kernel-dev-aa5e5ceaf52a882a29d9b86531a20733f5116066.zip
op-kernel-dev-aa5e5ceaf52a882a29d9b86531a20733f5116066.tar.gz
ftrace: remove packed attribute on ftrace_page.
It causes unaligned access traps on platforms like sparc (ftrace_page may be marked packed, but once we return a dyn_ftrace sub-object from this array to another piece of code, the "packed" part of the typing information doesn't propagate). But also, it didn't serve any purpose either. Even if packed, on 64-bit or 32-bit, it didn't give us any more dyn_ftrace entries per-page. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/trace/ftrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index af5ad89..07b2a14 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -177,9 +177,9 @@ static DEFINE_MUTEX(ftrace_filter_lock);
struct ftrace_page {
struct ftrace_page *next;
- int index;
+ unsigned long index;
struct dyn_ftrace records[];
-} __attribute__((packed));
+};
#define ENTRIES_PER_PAGE \
((PAGE_SIZE - sizeof(struct ftrace_page)) / sizeof(struct dyn_ftrace))
OpenPOWER on IntegriCloud